← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/particle.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-07-11 10:09:41 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20130711100941-f0rwuvcwgl8ulqo8
Tags: 1.3.7.7.1-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/particle.cpp
205
205
        }
206
206
 
207
207
        // Update child emitters
208
 
        if ((mLifetimePast - 1) % Particle::emitterSkip == 0)
 
208
        if (Particle::emitterSkip && (mLifetimePast - 1)
 
209
            % Particle::emitterSkip == 0)
209
210
        {
210
211
            FOR_EACH (EmitterConstIterator, e, mChildEmitters)
211
212
            {
449
450
    newParticle->setVelocity(0.0f, 0.0f, 0.5f);
450
451
    newParticle->setGravity(0.0015f);
451
452
    newParticle->setLifetime(300);
452
 
    newParticle->setFadeOut(50);
453
 
    newParticle->setFadeIn(200);
 
453
    newParticle->setFadeOut(100);
 
454
    newParticle->setFadeIn(0);
454
455
 
455
456
    mChildParticles.push_back(newParticle);
456
457