Engine: Abstracted action key

Because some people prefer to use the space bar as the action key rather than the enter key, KeyInput now has a method that checks if either is down. Action key requiring conditions use this now instead of manually checking the key.

5 files changed, 9 insertions, 6 deletions

@@ -57,4 +57,9 @@ public class KeyInput
     {
         return key;
     }
+    
+    public boolean isActionDown()
+    {
+        return ((key == KeyEvent.VK_ENTER) || (key == KeyEvent.VK_SPACE));
+    }
 }
\ No newline at end of file
@@ -15,7 +15,6 @@ import com.fourisland.fourpuzzle.database.Music;
 import com.fourisland.fourpuzzle.database.Transitions;
 import com.fourisland.fourpuzzle.util.ObjectLoader;
 import java.awt.Graphics2D;
-import java.awt.event.KeyEvent;
 
 /**
  *
@@ -35,7 +34,7 @@ public class GameOverGameState implements GameState {
 
     public void processInput(KeyInput key)
     {
-        if ((key.getKey() == KeyEvent.VK_ENTER) || (key.getKey() == KeyEvent.VK_SPACE))
+        if (key.isActionDown())
         {
             Game.setSaveFile(new SaveFile());
             
@@ -48,7 +48,7 @@ public class TitleScreenGameState implements GameState {
     {
         if (pt.isElapsed())
         {
-            if (key.getKey() == KeyEvent.VK_ENTER)
+            if (key.isActionDown())
             {
                 Audio.playSound(Database.getSound(Sound.Selection));
                 
@@ -120,7 +120,7 @@ public class MapViewGameState implements GameState {
                 }
             }
 
-            if ((key.getKey() == KeyEvent.VK_ENTER) || (key.getKey() == KeyEvent.VK_SPACE))
+            if (key.isActionDown())
             {
                 for (LayerEvent ev : currentMap.getEvents())
                 {
@@ -16,7 +16,6 @@ import com.fourisland.fourpuzzle.util.Renderable;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.TexturePaint;
-import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
@@ -65,7 +64,7 @@ public class MessageWindow implements Renderable {
         Inputable in = new Inputable() {
             public void processInput(KeyInput key)
             {
-                if ((key.getKey() == KeyEvent.VK_ENTER) || (key.getKey() == KeyEvent.VK_SPACE))
+                if (key.isActionDown())
                 {
                     if (mw.pushEnter())
                     {