diff options
author | Justin Worthe <justin.worthe@entelect.co.za> | 2014-07-17 10:02:26 +0200 |
---|---|---|
committer | Justin Worthe <justin.worthe@entelect.co.za> | 2014-07-17 10:02:26 +0200 |
commit | 3f9df8f49cc84d77f585b77cbc9ac7c20478d406 (patch) | |
tree | 8e977eeb07f30d9e2dd75f7f896d41fc95dc0943 | |
parent | 83d3c7bac60e8c838c4a779fde7d8ff6c8a7cc90 (diff) |
Fixed bug in player movement
-rw-r--r-- | game/prefabs/player.js | 4 | ||||
-rw-r--r-- | game/states/play.js | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/game/prefabs/player.js b/game/prefabs/player.js index 3492836..98179d9 100644 --- a/game/prefabs/player.js +++ b/game/prefabs/player.js @@ -25,10 +25,6 @@ Player.prototype.update = function() { }; Player.prototype.move = function(newX, newY) { - if (this.moving || !this.isMyTurn) { - return; - } - this.moving = true; var tween = this.game.add.tween(this).to({x: newX, y: newY}, 500); tween.onComplete.add(this.finishMovement, this); diff --git a/game/states/play.js b/game/states/play.js index 104c322..e3009a5 100644 --- a/game/states/play.js +++ b/game/states/play.js @@ -182,7 +182,7 @@ Play.prototype = { var newX = player.x + deltaX; var newY = player.y + deltaY; - if (!this.checkMap(newX, newY) && player.isMyTurn) { + if (!this.checkMap(newX, newY) && player.isMyTurn && !player.moving) { player.move(newX, newY); this.togglePlayerTurn(); } |