marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed CreateParticleAtBone (would create particles at a wrong position) 

Also set "amount" to min. 1 because that's what intuition would dictate.
issue1247
David Dormagen 2014-09-26 21:32:08 +02:00
parent 7d5f2effb4
commit c09764b3fd
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/object/C4ObjectScript.cpp
View File

@ -2280,6 +2280,10 @@ static bool FnCreateParticleAtBone(C4Object* Obj, C4String* szName, C4String* sz
const float dy = ty + ry*thgt;
x.x += dx;
x.y += dy;
// This was added in the block before and could also just be removed from tx/ty.
// However, the block would no longer be equal to where it came from.
x.x -= fixtof(Obj->fix_x);
x.y -= fixtof(Obj->fix_y);
// Finally, apply DrawTransform to the world coordinates
StdMeshMatrix DrawTransform;
if(Obj->pDrawTransform)
@ -2318,6 +2322,7 @@ static bool FnCreateParticleAtBone(C4Object* Obj, C4String* szName, C4String* sz
valueLifetime.Set(lifetime);
// cast
if (amount < 1) amount = 1;
::Particles.Create(pDef, valueX, valueY, valueSpeedX, valueSpeedY, valueLifetime, properties, amount, Obj);
#endif
// success, even if not created