From: Gabriele Cirulli <gabrycir@gmail.com>
Date: Fri, 14 Mar 2014 12:34:05 +0000
Subject: rename GameOver to GameTerminated to avoid ambiguity
X-Git-Url: https://git.razvi.ro/?p=2048.git&a=commitdiff&h=5392893cd6f6f2e2fe461481729d18b870c311e3
---
rename GameOver to GameTerminated to avoid ambiguity
---


--- a/js/game_manager.js
+++ b/js/game_manager.js
@@ -25,7 +25,7 @@
   this.actuator.continue();
 };
 
-GameManager.prototype.isGameOver = function () {
+GameManager.prototype.isGameTerminated = function () {
   if (this.over || (this.won && !this.keepPlaying)) {
     return true;
   } else {
@@ -35,12 +35,12 @@
 
 // Set up the game
 GameManager.prototype.setup = function () {
-  this.grid         = new Grid(this.size);
-
-  this.score        = 0;
-  this.over         = false;
-  this.won          = false;
-  this.keepPlaying  = false;
+  this.grid        = new Grid(this.size);
+
+  this.score       = 0;
+  this.over        = false;
+  this.won         = false;
+  this.keepPlaying = false;
 
   // Add the initial tiles
   this.addStartTiles();
@@ -73,11 +73,11 @@
   }
 
   this.actuator.actuate(this.grid, {
-    score:     this.score,
-    over:      this.over,
-    won:       this.won,
-    bestScore: this.scoreManager.get(),
-    gameOver:  this.isGameOver()
+    score:      this.score,
+    over:       this.over,
+    won:        this.won,
+    bestScore:  this.scoreManager.get(),
+    terminated: this.isGameTerminated()
   });
 
 };
@@ -104,7 +104,7 @@
   // 0: up, 1: right, 2:down, 3: left
   var self = this;
 
-  if (this.isGameOver()) return; // Don't do anything if the game's over
+  if (this.isGameTerminated()) return; // Don't do anything if the game's over
 
   var cell, tile;
 

--- a/js/html_actuator.js
+++ b/js/html_actuator.js
@@ -24,9 +24,12 @@
     self.updateScore(metadata.score);
     self.updateBestScore(metadata.bestScore);
 
-    if (metadata.gameOver) {
-      if (metadata.over) self.message(false); // You lose
-      else if (metadata.won) self.message(true); // You win!
+    if (metadata.terminated) {
+      if (metadata.over) {
+        self.message(false); // You lose
+      } else if (metadata.won) {
+        self.message(true); // You win!
+      }
     }
 
   });