diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index 45456b6f2..bbb8ab7c6 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -113,7 +113,7 @@ class StateInGame : BasicGameState() { /** * Set to false if UI is opened; set to true if UI is closed. */ - var canPlayerMove: Boolean = false + var canPlayerControl: Boolean = false get() = !paused // FIXME temporary behab (block movement if the game is paused or paused by UIs) @Throws(SlickException::class) @@ -521,7 +521,7 @@ class StateInGame : BasicGameState() { GameController.keyPressed(key, c) - if (canPlayerMove) { + if (canPlayerControl) { player?.keyPressed(key, c) } diff --git a/src/net/torvald/terrarum/gamecontroller/GameController.kt b/src/net/torvald/terrarum/gamecontroller/GameController.kt index a269fa7d2..6eea005cd 100644 --- a/src/net/torvald/terrarum/gamecontroller/GameController.kt +++ b/src/net/torvald/terrarum/gamecontroller/GameController.kt @@ -41,7 +41,7 @@ object GameController { // actor process input if (!ingame.consoleHandler.isTakingControl) { - if (ingame.canPlayerMove) { + if (ingame.canPlayerControl) { ingame.actorContainer.forEach { if (it is Controllable) { // disable control of actor if the actor is riding something? @@ -70,7 +70,7 @@ object GameController { /////////////////// // Use item: assuming the player has only one effective grip (EquipPosition.HAND_GRIP) - if (ingame.player != null) { + if (ingame.player != null && ingame.canPlayerControl) { if (input.isMouseButtonDown(Terrarum.getConfigInt("mouseprimary")) || input.isMouseButtonDown(Terrarum.getConfigInt("mousesecondary"))) { val itemOnGrip = ingame.player!!.inventory.itemEquipped[InventoryItem.EquipPosition.HAND_GRIP]