提交 5392893c 编写于 作者: G Gabriele Cirulli

rename GameOver to GameTerminated to avoid ambiguity

上级 cfbf7490
...@@ -25,7 +25,7 @@ GameManager.prototype.keepPlaying = function () { ...@@ -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 {
...@@ -77,7 +77,7 @@ GameManager.prototype.actuate = function () { ...@@ -77,7 +77,7 @@ GameManager.prototype.actuate = function () {
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) { ...@@ -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;
......
...@@ -24,9 +24,12 @@ HTMLActuator.prototype.actuate = function (grid, metadata) { ...@@ -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!
}
} }
}); });
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册