Added parentMap data to Event

StepMoveEvent has an issue where an event could walk off the screen under its influence because it preformed no collision checking, due to the fact that the parent map had to be accessable to preform collision checking. Now, both event styles (unified with an AbstractEvent class that handles functions common to both styles) carries information about its parent map, provided by EventList which is in turn provided by the parent map itself.

1 files changed, 12 insertions, 2 deletions

@@ -6,7 +6,9 @@
 package com.fourisland.fourpuzzle.gamestate.mapview;
 
 import com.fourisland.fourpuzzle.*;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.EventList;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.HeroEvent;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.LayerEvent;
 import java.awt.Dimension;
 import java.util.HashMap;
@@ -41,7 +43,7 @@ public abstract class Map {
         }
     }
     
-    private EventList events = new EventList();
+    private EventList events = new EventList(this);
     public EventList getEvents()
     {
         return events;
@@ -59,8 +61,11 @@ public abstract class Map {
         return null;
     }
     
-    public boolean checkForCollision(int x, int y, Direction toMove)
+    public boolean checkForCollision(Event ev, Direction toMove)
     {
+        int x = ev.getLocation().x;
+        int y = ev.getLocation().y;
+        
         if ((toMove == Direction.North) && (y == 0))
         {
             return true;
@@ -75,6 +80,11 @@ public abstract class Map {
             return true;
         }
         
+        if ((ev instanceof HeroEvent) && (((MapViewGameState) Game.getGameState()).debugWalkthrough))
+        {
+            return false;
+        }
+        
         if ((toMove == Direction.North) && (checkForEventCollision(x, y-1)))
         {
             return true;