Offline easter egg - Fix incorrect score when restarting from a paused game

components/neterror/resources/offline.js

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 (function() {
 'use strict';
 /**
  * T-Rex runner.
  * @param {string} outerContainerId Outer containing element id.
  * @param {Object} opt_config
  * @constructor
@@ skipping 640 matching lines @@
     }
   },
 
   /**
    * Process keydown.
    * @param {Event} e
    */
   onKeyDown: function(e) {
     // Prevent native page scrolling whilst tapping on mobile.
     if (IS_MOBILE && this.playing) {
       e.preventDefault();

[mmenke, 2017/03/20 15:11:28]

Is this the right thing to do if e.target == this.detailsButton?  There's an
exception to do nothing if that's the case below, seems weird that there's no
similar exception here.  Does this only prevent scrolling?  Seems fairly broad
for that.

[edwardjung, 2017/03/21 18:51:21]

Yes, as during game play you don't want to be accidentally hit the details
button.

However the recent layout change means there is no details button shown on the
offline page any more. So it doesn't apply anymore.

     }
 
-    if (e.target != this.detailsButton) {
-      if (!this.crashed && (Runner.keycodes.JUMP[e.keyCode] ||
-           e.type == Runner.events.TOUCHSTART)) {
-        if (!this.playing) {
-          this.loadSounds();
-          this.playing = true;
-          this.update();
-          if (window.errorPageController) {
-            errorPageController.trackEasterEgg();
+    if (!this.paused) {

[mmenke, 2017/03/20 15:11:28]

Exactly what line are you trying to skip here?  I don't see how the score would
be updated by any of this code.

[edwardjung, 2017/03/21 18:51:21]

this.update();

As the delta time is calculated when the the game is paused, the score is
updated incorrectly. It's only when the key as actually pressed (key up) the
game time is reset.

Line 727:
  } else if (this.paused && isjumpKey) {
  …
  this.play();
  }

I've refactored this method so it's clearer.

+      if (e.target != this.detailsButton) {
+        if (!this.crashed && (Runner.keycodes.JUMP[e.keyCode] ||
+             e.type == Runner.events.TOUCHSTART)) {
+          if (!this.playing) {
+            this.loadSounds();
+            this.playing = true;
+            this.update();
+            if (window.errorPageController) {
+              errorPageController.trackEasterEgg();
+            }
+          }
+          // Play sound effect and jump on starting the game for the first time.
+          if (!this.tRex.jumping && !this.tRex.ducking) {
+            this.playSound(this.soundFx.BUTTON_PRESS);
+            this.tRex.startJump(this.currentSpeed);
           }
         }
-        //  Play sound effect and jump on starting the game for the first time.
-        if (!this.tRex.jumping && !this.tRex.ducking) {
-          this.playSound(this.soundFx.BUTTON_PRESS);
-          this.tRex.startJump(this.currentSpeed);
+
+        if (this.crashed && e.type == Runner.events.TOUCHSTART &&
+            e.currentTarget == this.containerEl) {
+          this.restart();
         }
       }
 
-      if (this.crashed && e.type == Runner.events.TOUCHSTART &&
-          e.currentTarget == this.containerEl) {
-        this.restart();
-      }
-    }
-
-    if (this.playing && !this.crashed && Runner.keycodes.DUCK[e.keyCode]) {
-      e.preventDefault();
-      if (this.tRex.jumping) {
-        // Speed drop, activated only when jump key is not pressed.
-        this.tRex.setSpeedDrop();
-      } else if (!this.tRex.jumping && !this.tRex.ducking) {
-        // Duck.
-        this.tRex.setDuck(true);
+      if (this.playing && !this.crashed && Runner.keycodes.DUCK[e.keyCode]) {
+        e.preventDefault();
+        if (this.tRex.jumping) {
+          // Speed drop, activated only when jump key is not pressed.
+          this.tRex.setSpeedDrop();
+        } else if (!this.tRex.jumping && !this.tRex.ducking) {
+          // Duck.
+          this.tRex.setDuck(true);
+        }
       }
     }
   },
 
 
   /**
    * Process key up.
    * @param {Event} e
    */
   onKeyUp: function(e) {
@@ skipping 99 matching lines @@
       this.time = getTimeStamp();
       this.update();
     }
   },
 
   restart: function() {
     if (!this.raqId) {
       this.playCount++;
       this.runningTime = 0;
       this.playing = true;
+      this.paused = false;
       this.crashed = false;
       this.distanceRan = 0;
       this.setSpeed(this.config.SPEED);
       this.time = getTimeStamp();
       this.containerEl.classList.remove(Runner.classes.CRASHED);
       this.clearCanvas();
       this.distanceMeter.reset(this.highestScore);
       this.horizon.reset();
       this.tRex.reset();
       this.playSound(this.soundFx.BUTTON_PRESS);
@@ skipping 1866 matching lines @@
 
   /**
    * Add a new cloud to the horizon.
    */
   addCloud: function() {
     this.clouds.push(new Cloud(this.canvas, this.spritePos.CLOUD,
         this.dimensions.WIDTH));
   }
 };
 })();