3 files changed, 21 insertions, 16 deletions

@@ -79,7 +79,7 @@ public class MapViewGameState implements GameState {
                 debugWalkthrough = false;
             }
 
-            if (!hero.isMoving() && !MoveEventThread.isHeroMoving() && !EventHandler.isRunningEvent())
+            if (!hero.isMoving() && !MoveEventThread.isHeroActive() && !EventHandler.isRunningEvent())
             {
                 Direction toMove = null;
                 Boolean letsMove = false;
@@ -181,7 +181,7 @@ public class MapViewGameState implements GameState {
         {
             if (!ev.isMoving())
             {
-                if (!MoveEventThread.isOtherMoving(ev))
+                if (!MoveEventThread.isOtherActive(ev))
                 {
                     if (!EventHandler.isRunningEvent())
                     {
@@ -112,7 +112,7 @@ public class SpecialEvent {
      */
     public void MoveEvent(MoveEvent[] actions)
     {
-        new Thread(new MoveEventThread(Game.getHeroEvent(), actions)).start();
+        new MoveEventThread(Game.getHeroEvent(), actions).start();
     }
     
     /**
@@ -123,7 +123,7 @@ public class SpecialEvent {
      */
     public void MoveEvent(MoveEvent[] actions, String label)
     {
-        new Thread(new MoveEventThread(((MapViewGameState) Game.getGameState()).getCurrentMap().getEvent(label), actions)).start();
+        new MoveEventThread(mapView.getCurrentMap().getEvent(label), actions).start();
     }
     
     /**
@@ -10,6 +10,8 @@ import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.LayerEvent;
 import java.util.List;
 import java.util.Vector;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
 
 /**
@@ -17,7 +19,9 @@ import java.util.concurrent.Semaphore;
  * @author hatkirby
  */
 public class MoveEventThread implements Runnable {
-        
+    
+    private static Executor moveEventExecutor = Executors.newCachedThreadPool();
+
     private static volatile List<Event> events = new Vector<Event>();
     private static volatile Semaphore moveEventWait = new Semaphore(100);
     
@@ -29,6 +33,11 @@ public class MoveEventThread implements Runnable {
         this.ev = ev;
         this.actions = actions;
     }
+    
+    public void start()
+    {
+        moveEventExecutor.execute(this);
+    }
 
     public void run()
     {
@@ -58,24 +67,20 @@ public class MoveEventThread implements Runnable {
         moveEventWait.release();
     }
     
-    /* TODO Rename the two following methods (isHeroMoving and isOtherMoving)
-     * to isHeroActive and isOtherActive respectively.
-     */
-    
-    public static boolean isHeroMoving()
+    public static void moveAll() throws InterruptedException
     {
-        return (events.contains(Game.getHeroEvent()));
+        moveEventWait.acquire(100);
+        moveEventWait.release(100);
     }
     
-    public static boolean isOtherMoving(LayerEvent event)
+    public static boolean isHeroActive()
     {
-        return (events.contains(event));
+        return (events.contains(Game.getHeroEvent()));
     }
     
-    public static void moveAll() throws InterruptedException
+    public static boolean isOtherActive(LayerEvent event)
     {
-        moveEventWait.acquire(100);
-        moveEventWait.release(100);
+        return (events.contains(event));
     }
 
 }