Fixed off-screen bug

If an Event is adjacent to a Map boundary, then it could accidentally walk off the screen during the following circumstance: When a MoveEvent() action tells said Event to move off-screen while the Event is already moving, collision checking will be bypassed and the Event will proceed to walk off the screen, after which an Exception will be thrown when said Event attempts to move again. This bug has been fixed.

6 files changed, 28 insertions, 11 deletions

@@ -37,6 +37,13 @@ public class Audio {
                 }
             }));
         } catch (MidiUnavailableException ex) {
+            /* TODO Because of the frequent MIDI unavailability, when
+             * a MIDI sequencer is unavailable, instead of breaking down,
+             * the application should display a message that something
+             * went wrong with the sound and that they should attempt
+             * the game again.
+             */
+            
             Logger.getLogger(Audio.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
@@ -147,7 +147,7 @@ public class MapViewGameState implements GameState {
                 {
                     if (!EventHandler.isRunningEvent())
                     {
-                        ev.startMoving(currentMap);
+                        ev.startMoving();
                     }
                 }
             } else {
@@ -41,8 +41,13 @@ public abstract class AbstractEvent implements Event {
     }
     
     private int moveTimer;
-    public void startMoving(Direction toMove)
+    public boolean startMoving(Direction toMove)
     {
+        if (isMoving())
+        {
+            return false;
+        }
+        
         setDirection(toMove);
         
         if (!getParentMap().checkForCollision(this, toMove))
@@ -50,6 +55,10 @@ public abstract class AbstractEvent implements Event {
             setAnimationStep(2);
             moveTimer = 4;
             setMoving(true);
+            
+            return true;
+        } else {
+            return false;
         }
     }
     
@@ -32,7 +32,7 @@ public interface Event {
     public void setDirection(Direction direction);
 
     public boolean isMoving();
-    public void startMoving(Direction direction);
+    public boolean startMoving(Direction direction);
     
     public Layer getLayer();
     
@@ -90,7 +90,7 @@ public class LayerEvent extends AbstractEvent implements Event {
         }
     }
     
-    public void startMoving(Map map)
+    public void startMoving()
     {
         Direction toMove = getPossibleEvent().getMovement().nextMovement();
         
@@ -24,14 +24,15 @@ public class StepMoveEvent implements MoveEvent {
     
     public void doAction(Event ev)
     {
-        ev.startMoving(direction);
-
-        while (ev.isMoving())
+        if (ev.startMoving(direction))
         {
-            try {
-                Thread.sleep(2);
-            } catch (InterruptedException ex) {
-                Logger.getLogger(StepMoveEvent.class.getName()).log(Level.SEVERE, null, ex);
+            while (ev.isMoving())
+            {
+                try {
+                    Thread.sleep(2);
+                } catch (InterruptedException ex) {
+                    Logger.getLogger(StepMoveEvent.class.getName()).log(Level.SEVERE, null, ex);
+                }
             }
         }
     }