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).

6 files changed, 64 insertions, 7 deletions

@@ -32,4 +32,6 @@ public interface Event {
     public void startMoving(Direction direction);
     
     public Layer getLayer();
+    
+    public boolean isOccupyingSpace(int x, int y);
 }
@@ -12,6 +12,7 @@ import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.Game;
 import com.fourisland.fourpuzzle.GameCharacter;
 import com.fourisland.fourpuzzle.gamestate.mapview.CharSet;
+import com.fourisland.fourpuzzle.util.Functions;
 
 /**
  *
@@ -65,6 +66,10 @@ public class HeroEvent implements Event {
             }
         }
         
+        /* TODO Change the specification of GameCharacter
+         * to require an EventGraphic instead of a graphic name
+         * and offset
+         */
         GameCharacter toDraw = Game.getSaveFile().getParty().getLeader();
         if (!toDraw.getGraphic().equals("blank"))
         {
@@ -147,5 +152,20 @@ public class HeroEvent implements Event {
     {
         return Layer.Middle;
     }
+    
+    public boolean isOccupyingSpace(int x, int y)
+    {
+        if (getLocation().equals(new Point(x,y)))
+        {
+            return true;
+        }
+        
+        if (Functions.isMovingTo(this, x, y))
+        {
+            return true;
+        }
+        
+        return false;
+    }
 
 }
@@ -11,6 +11,7 @@ import java.awt.Point;
 import java.util.ArrayList;
 import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.gamestate.mapview.Map;
+import com.fourisland.fourpuzzle.util.Functions;
 
 /**
  *
@@ -209,4 +210,19 @@ public class LayerEvent implements Event {
         this.label = string;
     }
     
+    public boolean isOccupyingSpace(int x, int y)
+    {
+        if (getLocation().equals(new Point(x,y)))
+        {
+            return true;
+        }
+        
+        if (Functions.isMovingTo(this, x, y))
+        {
+            return true;
+        }
+        
+        return false;
+    }
+    
 }
\ No newline at end of file
@@ -17,6 +17,14 @@ import java.util.logging.Logger;
  * @author hatkirby
  */
 public class SpecialEvent {
+    
+    /* TODO Create a manager for SpecialEvent action threads that
+     * controls when they are executed and allows MapViewGameState
+     * to poll it to see if it is currently managing any action
+     * threads. If it is, MapViewGameState should be able to prevent
+     * certain actions from occuring (unless the action thread is
+     * ParallelProcess) such as keyboard input.
+     */
 
     /**
      * Display a message on the screen.
@@ -120,11 +128,7 @@ public class SpecialEvent {
      */
     public void MoveEventWait()
     {
-        try {
-            MoveEventThread.moveEventWait.await();
-        } catch (InterruptedException ex) {
-            Logger.getLogger(SpecialEvent.class.getName()).log(Level.SEVERE, null, ex);
-        }
+        MoveEventThread.moveAll();
     }
     
     /**
@@ -13,6 +13,7 @@ import com.fourisland.fourpuzzle.Direction;
  */
 public interface MovementType {
     
+    // TODO Rename the following method to getNextDirection
     public Direction startMoving();
     
 }
@@ -20,9 +20,10 @@ import java.util.logging.Logger;
  */
 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>();
+    
+    static volatile List<Event> events = new Vector<Event>();
+    static volatile CountDownLatch moveEventWait = new CountDownLatch(0);
     
     Event ev;
     MoveEvent[] actions;
@@ -51,6 +52,10 @@ public class MoveEventThread implements Runnable {
         moveEventWait.countDown();
     }
     
+    /* TODO Rename the two following methods (isHeroMoving and isOtherMoving)
+     * to isHeroActive and isOtherActive respectively.
+     */
+    
     public static boolean isHeroMoving()
     {
         return (events.contains(Game.getHeroEvent()));
@@ -60,5 +65,14 @@ public class MoveEventThread implements Runnable {
     {
         return (events.contains(event));
     }
+    
+    public static void moveAll()
+    {
+        try {
+            moveEventWait.await();
+        } catch (InterruptedException ex) {
+            Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
 
 }