diff --git a/src/Particle.c b/src/Particle.c index 5b721b7df..f8c42bace 100644 --- a/src/Particle.c +++ b/src/Particle.c @@ -534,18 +534,9 @@ void Particles_CustomEffect(float x, float y, float z, int propertyID, float ori Vec3 diff; Vec3_Sub(&diff, &p->base.lastPos, &origin); Vec3_Normalize(&diff, &diff); - - if (p->prop->converge) { - p->base.velocity.X = (-diff.X) * p->prop->speed; - p->base.velocity.Y = (-diff.Y) * p->prop->speed; - p->base.velocity.Z = (-diff.Z) * p->prop->speed; - } - else { - p->base.velocity.X = diff.X * p->prop->speed; - p->base.velocity.Y = diff.Y * p->prop->speed; - p->base.velocity.Z = diff.Z * p->prop->speed; - } - + p->base.velocity.X = diff.X * p->prop->speed; + p->base.velocity.Y = diff.Y * p->prop->speed; + p->base.velocity.Z = diff.Z * p->prop->speed; } p->base.nextPos = p->base.lastPos; @@ -611,7 +602,6 @@ static void Particles_Init(void) { prop->baseLifetime = 0.7f; prop->lifetimeVariation = 0.5f; prop->fullBright = true; - prop->converge = true; prop->expireUponTouchingGround = true; //END TEMP CODE diff --git a/src/Particle.h b/src/Particle.h index 684590906..2a1079cd9 100644 --- a/src/Particle.h +++ b/src/Particle.h @@ -30,7 +30,6 @@ struct CustomParticleProperty { float lifetimeVariation; cc_bool expireUponTouchingGround; cc_bool fullBright; - cc_bool converge; ////true means the particles move toward the origin. False means they move away from the origin }; extern struct CustomParticleProperty customParticle_properties[256];