summary refs log tree commit diff stats
path: root/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java
diff options
context:
space:
mode:
authorStarla Insigna <hatkirby@fourisland.com>2009-01-19 16:22:50 -0500
committerStarla Insigna <hatkirby@fourisland.com>2009-01-19 16:22:50 -0500
commit80fd704e66e98d70e98da977b01568b7813d80e9 (patch)
tree8ea16d1f3d37a212c42025e3fbc86d1f4c15545f /src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java
parent69b495c392bffe96dab97306a42466edd4b2474e (diff)
downloadfourpuzzle-80fd704e66e98d70e98da977b01568b7813d80e9.tar.gz
fourpuzzle-80fd704e66e98d70e98da977b01568b7813d80e9.tar.bz2
fourpuzzle-80fd704e66e98d70e98da977b01568b7813d80e9.zip
Fixed MoveEvent bug
Diffstat (limited to 'src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java')
-rw-r--r--src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java index 26f89c7..121bbe8 100644 --- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java +++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java
@@ -6,10 +6,9 @@
6package com.fourisland.fourpuzzle.gamestate.mapview.event; 6package com.fourisland.fourpuzzle.gamestate.mapview.event;
7 7
8import com.fourisland.fourpuzzle.*; 8import com.fourisland.fourpuzzle.*;
9import com.fourisland.fourpuzzle.gamestate.mapview.MapViewGameState;
9import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEvent; 10import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEvent;
10import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread; 11import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread;
11import java.util.concurrent.BrokenBarrierException;
12import java.util.concurrent.CyclicBarrier;
13import java.util.logging.Level; 12import java.util.logging.Level;
14import java.util.logging.Logger; 13import java.util.logging.Logger;
15 14
@@ -102,18 +101,18 @@ public class SpecialEvent {
102 */ 101 */
103 public void MoveEvent(MoveEvent[] actions) 102 public void MoveEvent(MoveEvent[] actions)
104 { 103 {
105 MoveEvent(actions, Game.getHeroEvent()); 104 new Thread(new MoveEventThread(Game.getHeroEvent(), actions)).start();
106 } 105 }
107 106
108 /** 107 /**
109 * Performs actions on an event 108 * Performs actions on an event
110 * 109 *
111 * @param actions An array of MoveEvents to perform on the event 110 * @param actions An array of MoveEvents to perform on the event
112 * @param ev The event to act upon 111 * @param label The label of the event to act upon
113 */ 112 */
114 public void MoveEvent(MoveEvent[] actions, Event ev) 113 public void MoveEvent(MoveEvent[] actions, String label)
115 { 114 {
116 new Thread(new MoveEventThread(ev, actions)).start(); 115 new Thread(new MoveEventThread(((MapViewGameState) Game.getGameState()).getCurrentMap().getEvent(label), actions)).start();
117 } 116 }
118 117
119 /** 118 /**