diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-01-27 14:28:43 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-01-27 14:28:43 -0500 |
commit | 9ca53b553cfaf488f7e8e678721bf9e655fa377e (patch) | |
tree | fa110584eb1b083fbe0e005ab9f235f3a8f931f1 /src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java | |
parent | cd6b39590b8aced78fc2f6ed0c345fb9af1960c0 (diff) | |
download | fourpuzzle-9ca53b553cfaf488f7e8e678721bf9e655fa377e.tar.gz fourpuzzle-9ca53b553cfaf488f7e8e678721bf9e655fa377e.tar.bz2 fourpuzzle-9ca53b553cfaf488f7e8e678721bf9e655fa377e.zip |
Fixed "walk-thru-me" bug
Previously, Map's checkForCollision did not properly check collision and would allow an event to initiate movement to a location another event was already moving to (but wasn't at yet).
Diffstat (limited to 'src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java')
-rw-r--r-- | src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java index 077f42e..52b75de 100644 --- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java +++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java | |||
@@ -17,6 +17,14 @@ import java.util.logging.Logger; | |||
17 | * @author hatkirby | 17 | * @author hatkirby |
18 | */ | 18 | */ |
19 | public class SpecialEvent { | 19 | public class SpecialEvent { |
20 | |||
21 | /* TODO Create a manager for SpecialEvent action threads that | ||
22 | * controls when they are executed and allows MapViewGameState | ||
23 | * to poll it to see if it is currently managing any action | ||
24 | * threads. If it is, MapViewGameState should be able to prevent | ||
25 | * certain actions from occuring (unless the action thread is | ||
26 | * ParallelProcess) such as keyboard input. | ||
27 | */ | ||
20 | 28 | ||
21 | /** | 29 | /** |
22 | * Display a message on the screen. | 30 | * Display a message on the screen. |
@@ -120,11 +128,7 @@ public class SpecialEvent { | |||
120 | */ | 128 | */ |
121 | public void MoveEventWait() | 129 | public void MoveEventWait() |
122 | { | 130 | { |
123 | try { | 131 | MoveEventThread.moveAll(); |
124 | MoveEventThread.moveEventWait.await(); | ||
125 | } catch (InterruptedException ex) { | ||
126 | Logger.getLogger(SpecialEvent.class.getName()).log(Level.SEVERE, null, ex); | ||
127 | } | ||
128 | } | 132 | } |
129 | 133 | ||
130 | /** | 134 | /** |