Timer resume catch-up moved out of the core Time loop.

Author: photonstorm

src/time/Time.js

@@ -218,25 +218,12 @@ Phaser.Time.prototype = {
 
         this.now = time;
 
-        if (this._justResumed)
-        {
-            this.time = this.now;
-            this._justResumed = false;
-
-            this.events.resume();
-
-            for (var i = 0; i < this._timers.length; i++)
-            {
-                this._timers[i]._resume();
-            }
-        }
-
         this.timeToCall = this.game.math.max(0, 16 - (time - this.lastTime));
 
         this.elapsed = this.now - this.time;
 
-        //calculate physics elapsed, ensure it's > 0, use 1/60 as a fallback
-        this.physicsElapsed = this.elapsed / 1000 || 1/60;
+        //  Calculate physics elapsed, ensure it's > 0, use 1/60 as a fallback
+        this.physicsElapsed = this.elapsed / 1000 || 1 / 60;
 
         if (this.deltaCap > 0 && this.physicsElapsed > this.deltaCap)
         {
@@ -324,18 +311,15 @@ Phaser.Time.prototype = {
 
         this.pauseDuration = this.time - this._pauseStarted;
 
-        this._justResumed = true;
-
         this.events.resume();
 
         var i = this._timers.length;
 
         while (i--)
         {
-            // this._timers[i]._resume();
+            this._timers[i]._resume();
         }
 
-
     },
 
     /**

src/time/Timer.js

@@ -382,10 +382,6 @@ Phaser.Timer.prototype = {
             return true;
         }
 
-        if (time < this._now)
-        {
-            console.log('time travel?', time, this._now = time);
-        }
         this._now = time;
         this._marked = 0;
 
@@ -461,18 +457,13 @@ Phaser.Timer.prototype = {
     */
     pause: function () {
 
-        console.log('Timer.pause called');
-
         if (this.paused)
         {
-            console.log('Already paused, aborting');
             return;
         }
 
         this._pauseStarted = this.game.time.now;
 
-        console.log('paused duration', this.duration);
-
         this.paused = true;
         this._codePaused = true;
 
@@ -485,11 +476,8 @@ Phaser.Timer.prototype = {
     */
     _pause: function () {
 
-        console.log('Timer._pause called');
-
         if (this.paused)
         {
-            console.log('Already paused, aborting');
             return;
         }
 
@@ -506,23 +494,14 @@ Phaser.Timer.prototype = {
     */
     resume: function () {
 
-        console.log('Timer.resume called');
-
         if (!this.paused)
         {
-            console.log('No longer paused, aborting');
             return;
         }
 
-        // var durationBeforePause = this.duration;
-
-        // console.log('old duration', durationBeforePause);
-
         this._pauseTotal += this.game.time.pauseDuration;
         this._now = this.game.time.time;
 
-        console.log('paused for', this.game.time.pauseDuration);
-
         for (var i = 0; i < this.events.length; i++)
         {
             if (!this.events[i].pendingDelete)
@@ -537,13 +516,9 @@ Phaser.Timer.prototype = {
 
                 //  Add the difference on to the time now
                 this.events[i].tick = this._now + t;
-
-                console.log('event increased by', t);
             }
         }
 
-        // this.nextTick = this._now + durationBeforePause;
-
         var d = this.nextTick - this._pauseStarted;
 
         if (d < 0)
@@ -555,29 +530,6 @@ Phaser.Timer.prototype = {
             this.nextTick = this._now + d;
         }
 
-        console.log('nextTick +', d);
-
-
-        // if (this.nextTick > this._now)
-        // {
-        //     //  event was going to tick in the future, but we need to add the time it was paused to it
-        //     d = this.nextTick - this._now;
-        //     t = this.game.time.pauseDuration;
-        //     this.nextTick += t;
-        //     console.log('next tick was going to tick in the future', t);
-        // }
-        // else
-        // {
-        //     //  event tick time has elapsed due to pause
-        //     d = this._now - this.nextTick; //
-        //     // t = this.game.time.pauseDuration - d;
-        //     t = this.game.time.pauseDuration;
-        //     this.nextTick += t;
-        //     console.log('next tick has elapsed behind game time by', t);
-        // }
-
-        console.log('new duration', this.duration);
-        
         this.paused = false;
         this._codePaused = false;
 
@@ -590,16 +542,12 @@ Phaser.Timer.prototype = {
     */
     _resume: function () {
 
-        console.log('Timer._resume called');
-
         if (this._codePaused)
         {
-            console.log('code paused');
             return;
         }
         else
         {
-            console.log('normal resume');
             this.resume();
         }