Engine: Fixed MessageWindow bug

Previously, MessageWindow would, on occasion, throw out an ArrayIndexOutOfBoundsException. This may have been because of some keyboard input. Because of this, the keyboard input system has been re-written to be anologous to the Display system (Renderable). Now, only one input processor will run at a time because they are executed in order by KeyboardInput, rather than all at once using AWT event handlers.

1 files changed, 55 insertions, 60 deletions

@@ -11,6 +11,7 @@ import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.Display;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.HeroEvent;
 import com.fourisland.fourpuzzle.Game;
+import com.fourisland.fourpuzzle.KeyInput;
 import com.fourisland.fourpuzzle.Layer;
 import com.fourisland.fourpuzzle.PuzzleApplication;
 import com.fourisland.fourpuzzle.database.Database;
@@ -34,7 +35,6 @@ import java.awt.image.BufferedImage;
 public class MapViewGameState implements GameState {
     
     public boolean debugWalkthrough = false;
-    boolean processInput = true;
     Map currentMap;
     Viewpoint currentViewpoint = null;
     
@@ -61,90 +61,85 @@ public class MapViewGameState implements GameState {
         // Do nothing, yet
     }
 
-    public void processInput()
+    public void processInput(KeyInput key)
     {
-        if (processInput)
-        {
-            HeroEvent hero = Game.getSaveFile().getHero();
+        HeroEvent hero = Game.getSaveFile().getHero();
 
-            if (Game.getKey().isControlDown() && !debugWalkthrough)
+        if (key.isCtrlDown() && !debugWalkthrough)
+        {
+            if (PuzzleApplication.INSTANCE.getContext().getResourceMap().getBoolean("debugMode"))
             {
-                if (PuzzleApplication.INSTANCE.getContext().getResourceMap().getBoolean("debugMode"))
-                {
-                    debugWalkthrough = true;
-                }
-            } else {
-                debugWalkthrough = false;
+                debugWalkthrough = true;
             }
+        } else {
+            debugWalkthrough = false;
+        }
 
-            if (!hero.isMoving() && !MoveEventThread.isHeroActive() && !EventHandler.isRunningEvent())
-            {
-                Direction toMove = null;
-                Boolean letsMove = false;
+        if (!hero.isMoving() && !MoveEventThread.isHeroActive() && !EventHandler.isRunningEvent())
+        {
+            Direction toMove = null;
+            Boolean letsMove = false;
 
-                switch (Game.getKey().getKeyCode())
-                {
-                    case KeyEvent.VK_UP:
-                        toMove = Direction.North;
-                        letsMove = true;
-                        break;
-                    case KeyEvent.VK_RIGHT:
-                        toMove = Direction.East;
-                        letsMove = true;
-                        break;
-                    case KeyEvent.VK_DOWN:
-                        toMove = Direction.South;
-                        letsMove = true;
-                        break;
-                    case KeyEvent.VK_LEFT:
-                        toMove = Direction.West;
-                        letsMove = true;
-                        break;
-                }
+            switch (key.getKey())
+            {
+                case KeyEvent.VK_UP:
+                    toMove = Direction.North;
+                    letsMove = true;
+                    break;
+                case KeyEvent.VK_RIGHT:
+                    toMove = Direction.East;
+                    letsMove = true;
+                    break;
+                case KeyEvent.VK_DOWN:
+                    toMove = Direction.South;
+                    letsMove = true;
+                    break;
+                case KeyEvent.VK_LEFT:
+                    toMove = Direction.West;
+                    letsMove = true;
+                    break;
+            }
 
-                if (letsMove)
+            if (letsMove)
+            {
+                if (!hero.startMoving(toMove))
                 {
-                    if (!hero.startMoving(toMove))
+                    for (LayerEvent ev : currentMap.getEvents())
                     {
-                        for (LayerEvent ev : currentMap.getEvents())
+                        if (ev.getCalltime() == EventCallTime.OnHeroTouch)
                         {
-                            if (ev.getCalltime() == EventCallTime.OnHeroTouch)
+                            if (ev.getLayer() == Layer.Middle)
                             {
-                                if (ev.getLayer() == Layer.Middle)
+                                if (Functions.isFacing(hero, ev))
                                 {
-                                    if (Functions.isFacing(hero, ev))
-                                    {
-                                        ev.getCallback().activate(ev.getCalltime());
-                                    }
+                                    ev.getCallback().activate(ev.getCalltime());
                                 }
                             }
                         }
                     }
                 }
+            }
 
-                if ((Game.getKey().getKeyCode() == KeyEvent.VK_ENTER) || (Game.getKey().getKeyCode() == KeyEvent.VK_SPACE))
+            if ((key.getKey() == KeyEvent.VK_ENTER) || (key.getKey() == KeyEvent.VK_SPACE))
+            {
+                for (LayerEvent ev : currentMap.getEvents())
                 {
-                    for (LayerEvent ev : currentMap.getEvents())
+                    if (ev.getCalltime() == EventCallTime.PushKey)
                     {
-                        if (ev.getCalltime() == EventCallTime.PushKey)
+                        if (ev.getLayer() == Layer.Middle)
                         {
-                            if (ev.getLayer() == Layer.Middle)
+                            if (Functions.isFacing(hero, ev))
                             {
-                                if (Functions.isFacing(hero, ev))
-                                {
-                                    ev.setDirection(hero.getDirection().opposite());
-                                    ev.getCallback().activate(ev.getCalltime());
-                                }
-                            } else {
-                                if (ev.getLocation().equals(hero.getLocation()))
-                                {
-                                    ev.getCallback().activate(ev.getCalltime());
-                                }
+                                ev.setDirection(hero.getDirection().opposite());
+                                ev.getCallback().activate(ev.getCalltime());
+                            }
+                        } else {
+                            if (ev.getLocation().equals(hero.getLocation()))
+                            {
+                                ev.getCallback().activate(ev.getCalltime());
                             }
                         }
                     }
-
-                    Game.getKey().setKeyCode(KeyEvent.VK_UNDEFINED);
                 }
             }
         }