Tidied up Emitter.update.

README.md

@@ -90,7 +90,9 @@ Version 2.2.2 - "Alkindar" - in development
 * Device.webAudio check inversed to avoid throwing a warning in Chrome.
 * Mouse.mouseMoveCallback is flagged as deprecated.
 * Remove `tw` and `th` init from TilemapLayer (thanks @nextht #1474)
-* Particles.Arcade.Emitter.makeParticles now checks the given `quantity` value against `Emitter.maxParticles`. If `quantity` is more than `maxParticles` then the `maxParticles` value is used instead.
+* Particles.Arcade.Emitter.makeParticles now checks the given `quantity` value against `Emitter.maxParticles`. If `quantity` is more than `maxParticles` then the `maxParticles` value is reset to the new `quantity` given (as this is how most devs seem to use it).
+* Particles.Arcade.Emitter.emitParticle now returns a boolean depending if a particle was emitted or not.
+* Particles.Arcade.Emitter.update only updates `_counter` if a particle was successfully emitted.
 
 ### Bug Fixes
 

src/particles/arcade/Emitter.js

@@ -247,25 +247,24 @@ Phaser.Particles.Arcade.Emitter.prototype.constructor = Phaser.Particles.Arcade.
 
 /**
 * Called automatically by the game loop, decides when to launch particles and when to "die".
+* 
 * @method Phaser.Particles.Arcade.Emitter#update
 */
 Phaser.Particles.Arcade.Emitter.prototype.update = function () {
 
     if (this.on && this.game.time.time >= this._timer)
     {
-        this.emitParticle();
+        this._timer = this.game.time.time + this.frequency * this.game.time.slowMotion;
 
+        if (this.emitParticle())
+        {
             this._counter++;
 
-        if (this._quantity > 0)
+            if (this._quantity > 0 && this._counter >= this._quantity)
-        {
-            if (this._counter >= this._quantity)
             {
                 this.on = false;
             }
         }
-
-        this._timer = this.game.time.time + this.frequency * this.game.time.slowMotion;
     }
 
     var i = this.children.length;
@@ -307,7 +306,7 @@ Phaser.Particles.Arcade.Emitter.prototype.makeParticles = function (keys, frames
 
     if (quantity > this.maxParticles)
     {
-        quantity = this.maxParticles;
+        this.maxParticles = quantity;
     }
 
     while (i < quantity)
@@ -411,8 +410,8 @@ Phaser.Particles.Arcade.Emitter.prototype.flow = function (lifespan, frequency,
 * @param {boolean} [explode=true] - Whether the particles should all burst out at once (true) or at the frequency given (false).
 * @param {number} [lifespan=0] - How long each particle lives once emitted in ms. 0 = forever.
 * @param {number} [frequency=250] - Ignored if Explode is set to true. Frequency is how often to emit 1 particle. Value given in ms.
-* @param {number} [quantity=0] - How many particles to launch. 0 = "all of the particles".
+* @param {number} [quantity=0] - How many particles to launch. 0 = "all of the particles" which will keep emitting until Emitter.maxParticles is reached.
-* @param {number} [forceQuantity=false] - If true and creating a particle flow, the quantity emitted will be forced to the be quantity given in this call.
+* @param {number} [forceQuantity=false] - If `true` and creating a particle flow, the quantity emitted will be forced to the be quantity given in this call. This can never exceed Emitter.maxParticles.
 */
 Phaser.Particles.Arcade.Emitter.prototype.start = function (explode, lifespan, frequency, quantity, forceQuantity) {
 
@@ -422,6 +421,11 @@ Phaser.Particles.Arcade.Emitter.prototype.start = function (explode, lifespan, f
     if (typeof quantity === 'undefined') { quantity = 0; }
     if (typeof forceQuantity === 'undefined') { forceQuantity = false; }
 
+    if (quantity > this.maxParticles)
+    {
+        quantity = this.maxParticles;
+    }
+
     this.revive();
 
     this.visible = true;
@@ -439,7 +443,7 @@ Phaser.Particles.Arcade.Emitter.prototype.start = function (explode, lifespan, f
     else
     {
         this.on = true;
-        this._quantity = quantity;
+        this._quantity += quantity;
         this._counter = 0;
         this._timer = this.game.time.time + frequency * this.game.time.slowMotion;
     }
@@ -450,6 +454,7 @@ Phaser.Particles.Arcade.Emitter.prototype.start = function (explode, lifespan, f
 * This function can be used both internally and externally to emit the next particle in the queue.
 *
 * @method Phaser.Particles.Arcade.Emitter#emitParticle
+* @return {boolean} True if a particle was emitted, otherwise false.
 */
 Phaser.Particles.Arcade.Emitter.prototype.emitParticle = function () {
 
@@ -457,7 +462,7 @@ Phaser.Particles.Arcade.Emitter.prototype.emitParticle = function () {
 
     if (particle === null)
     {
-        return;
+        return false;
     }
 
     if (this.width > 1 || this.height > 1)
@@ -531,6 +536,8 @@ Phaser.Particles.Arcade.Emitter.prototype.emitParticle = function () {
 
     particle.onEmit();
 
+    return true;
+
 };
 
 /**