Impaczus/2048
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename GameOver to GameTerminated to avoid ambiguity

Browse Source
This commit is contained in:
Gabriele Cirulli
2014-03-14 13:34:05 +01:00
parent cfbf74905f
commit 5392893cd6
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/game_manager.js
+12 -12
View File
@@ -25,7 +25,7 @@ GameManager.prototype.keepPlaying = function () {
this.actuator.continue(); this.actuator.continue();
}; };
GameManager.prototype.isGameOver = function () { GameManager.prototype.isGameTerminated = function () {
if (this.over || (this.won && !this.keepPlaying)) { if (this.over || (this.won && !this.keepPlaying)) {
return true; return true;
} else { } else {
@@ -35,12 +35,12 @@ GameManager.prototype.isGameOver = function () {
// Set up the game // Set up the game
GameManager.prototype.setup = function () { GameManager.prototype.setup = function () {
this.grid = new Grid(this.size); this.grid = new Grid(this.size);
this.score = 0; this.score = 0;
this.over = false; this.over = false;
this.won = false; this.won = false;
this.keepPlaying = false; this.keepPlaying = false;
// Add the initial tiles // Add the initial tiles
this.addStartTiles(); this.addStartTiles();
@@ -73,11 +73,11 @@ GameManager.prototype.actuate = function () {
} }
this.actuator.actuate(this.grid, { this.actuator.actuate(this.grid, {
score: this.score, score: this.score,
over: this.over, over: this.over,
won: this.won, won: this.won,
bestScore: this.scoreManager.get(), bestScore: this.scoreManager.get(),
gameOver: this.isGameOver() terminated: this.isGameTerminated()
}); });
}; };
@@ -104,7 +104,7 @@ GameManager.prototype.move = function (direction) {
// 0: up, 1: right, 2:down, 3: left // 0: up, 1: right, 2:down, 3: left
var self = this; 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; var cell, tile;
js/html_actuator.js
+6 -3
View File
@@ -24,9 +24,12 @@ HTMLActuator.prototype.actuate = function (grid, metadata) {
self.updateScore(metadata.score); self.updateScore(metadata.score);
self.updateBestScore(metadata.bestScore); self.updateBestScore(metadata.bestScore);
if (metadata.gameOver) { if (metadata.terminated) {
if (metadata.over) self.message(false); // You lose if (metadata.over) {
else if (metadata.won) self.message(true); // You win! self.message(false); // You lose
} else if (metadata.won) {
self.message(true); // You win!
}
} }
}); });