Fixed MoveEvent bug

5 files changed, 81 insertions, 12 deletions

@@ -22,4 +22,9 @@ public abstract class EventCall extends SpecialEvent implements Runnable {
 
     public abstract void run();
     
+    public void activate()
+    {
+        new Thread(this, "Special Event").start();
+    }
+    
 }
@@ -0,0 +1,42 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.fourisland.fourpuzzle.gamestate.mapview.event;
+
+import java.util.Vector;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class EventList extends Vector<LayerEvent> {
+    
+    @Override
+    public boolean add(LayerEvent o)
+    {
+        if (o.getLabel().equals("Unlabelled"))
+        {
+            o.setLabel("Event" + (this.size()+1));
+        } else {
+            if (    (o.getLabel().equals("Hero")) ||
+                    (o.getLabel().equals("Unlabelled")) ||
+                    (o.getLabel().equals("")))
+            {
+                return false;
+            }
+            
+            for (Event ev : this)
+            {
+                if (ev.getLabel().equals(o.getLabel()))
+                {
+                    return false;
+                }
+            }
+        }
+        
+        return super.add(o);
+    }
+
+}
@@ -27,6 +27,7 @@ public class LayerEvent implements Event {
     {
         location = new Point(x,y);
         events = new ArrayList<PossibleEvent>();
+        label = "Unlabelled";
     }
     
     /** Create a new Event instance
@@ -204,4 +205,8 @@ public class LayerEvent implements Event {
         return getPossibleEvent().getCallback();
     }
 
-}
+    public void setLabel(String string) {
+        this.label = string;
+    }
+    
+}
\ No newline at end of file
@@ -6,10 +6,9 @@
 package com.fourisland.fourpuzzle.gamestate.mapview.event;
 
 import com.fourisland.fourpuzzle.*;
+import com.fourisland.fourpuzzle.gamestate.mapview.MapViewGameState;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEvent;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CyclicBarrier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -102,18 +101,18 @@ public class SpecialEvent {
      */
     public void MoveEvent(MoveEvent[] actions)
     {
-        MoveEvent(actions, Game.getHeroEvent());
+        new Thread(new MoveEventThread(Game.getHeroEvent(), actions)).start();
     }
     
     /**
      * Performs actions on an event
      * 
      * @param actions An array of MoveEvents to perform on the event
-     * @param ev The event to act upon
+     * @param label The label of the event to act upon
      */
-    public void MoveEvent(MoveEvent[] actions, Event ev)
+    public void MoveEvent(MoveEvent[] actions, String label)
     {
-        new Thread(new MoveEventThread(ev, actions)).start();
+        new Thread(new MoveEventThread(((MapViewGameState) Game.getGameState()).getCurrentMap().getEvent(label), actions)).start();
     }
     
     /**
@@ -5,9 +5,12 @@
 
 package com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove;
 
+import com.fourisland.fourpuzzle.Game;
 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.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -19,6 +22,7 @@ public class MoveEventThread implements Runnable {
     
     public static volatile CountDownLatch moveEventWait = new CountDownLatch(0);
     public static volatile int countMoveEventThreads = 0;
+    public static volatile List<Event> events = new Vector<Event>();
     
     Event ev;
     MoveEvent[] actions;
@@ -29,22 +33,36 @@ public class MoveEventThread implements Runnable {
         this.actions = actions;
     }
 
-    public void run() {
+    public void run()
+    {
+        events.add(ev);
+        
         MoveEventThread.countMoveEventThreads++;
         moveEventWait = new CountDownLatch(countMoveEventThreads);
         
-        int i=0;
-        for (i=0;i<actions.length;i++)
+        for (MoveEvent action : actions)
         {
             try {
-                actions[i].doAction(ev);
+                action.doAction(ev);
             } catch (Exception ex) {
                 Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
         
+        events.remove(ev);
+        
         MoveEventThread.countMoveEventThreads--;
         moveEventWait.countDown();
     }
+    
+    public static boolean isHeroMoving()
+    {
+        return (events.contains(Game.getHeroEvent()));
+    }
+    
+    public static boolean isOtherMoving(LayerEvent event)
+    {
+        return (events.contains(event));
+    }
 
 }