danog/2048
1
0
Fork 0
mirror of https://github.com/danog/2048.git synced 2024-11-26 19:34:44 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/game_manager.js
View File

@ -25,7 +25,7 @@ GameManager.prototype.keepPlaying = function () {
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 @@ GameManager.prototype.isGameOver = function () {
// Set up the game
GameManager.prototype.setup = function () {
this.grid = new Grid(this.size);
this.grid = new Grid(this.size);
this.score = 0;
this.over = false;
this.won = false;
this.keepPlaying = false;
this.score = 0;
this.over = false;
this.won = false;
this.keepPlaying = false;
// Add the initial tiles
this.addStartTiles();
@ -73,11 +73,11 @@ GameManager.prototype.actuate = function () {
}
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 @@ GameManager.prototype.move = function (direction) {
// 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;

9
js/html_actuator.js
View File

@ -24,9 +24,12 @@ HTMLActuator.prototype.actuate = function (grid, metadata) {
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!
}
}
});