diff options
| author | Starla Insigna <hatkirby@fourisland.com> | 2009-02-03 21:47:22 -0500 |
|---|---|---|
| committer | Starla Insigna <hatkirby@fourisland.com> | 2009-02-03 21:47:22 -0500 |
| commit | a9e21cb37d1e6887270f68d90f2f3c8bcd775df2 (patch) | |
| tree | c444fc8268d6a829a9e17b9c9d4ab7dc501f6124 /src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | |
| parent | 029190712a8f38cef760741cf53652e0ccd89172 (diff) | |
| download | fourpuzzle-a9e21cb37d1e6887270f68d90f2f3c8bcd775df2.tar.gz fourpuzzle-a9e21cb37d1e6887270f68d90f2f3c8bcd775df2.tar.bz2 fourpuzzle-a9e21cb37d1e6887270f68d90f2f3c8bcd775df2.zip | |
Added Executor to MoveEventThread
Diffstat (limited to 'src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java')
| -rw-r--r-- | src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java index 9c66a9c..9c8e9d7 100644 --- a/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java +++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | |||
| @@ -79,7 +79,7 @@ public class MapViewGameState implements GameState { | |||
| 79 | debugWalkthrough = false; | 79 | debugWalkthrough = false; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | if (!hero.isMoving() && !MoveEventThread.isHeroMoving() && !EventHandler.isRunningEvent()) | 82 | if (!hero.isMoving() && !MoveEventThread.isHeroActive() && !EventHandler.isRunningEvent()) |
| 83 | { | 83 | { |
| 84 | Direction toMove = null; | 84 | Direction toMove = null; |
| 85 | Boolean letsMove = false; | 85 | Boolean letsMove = false; |
| @@ -181,7 +181,7 @@ public class MapViewGameState implements GameState { | |||
| 181 | { | 181 | { |
| 182 | if (!ev.isMoving()) | 182 | if (!ev.isMoving()) |
| 183 | { | 183 | { |
| 184 | if (!MoveEventThread.isOtherMoving(ev)) | 184 | if (!MoveEventThread.isOtherActive(ev)) |
| 185 | { | 185 | { |
| 186 | if (!EventHandler.isRunningEvent()) | 186 | if (!EventHandler.isRunningEvent()) |
| 187 | { | 187 | { |