ESC-Probleme für Pause behoben

This commit is contained in:
andreas
2014-12-08 21:19:14 +01:00
parent 1a7e6d45c6
commit 4108d5047f
+9 -4
View File
@@ -42,7 +42,12 @@ public class KeyBindings extends KeyAdapter {
down = false; down = false;
break; break;
case KeyEvent.VK_ESCAPE: case KeyEvent.VK_ESCAPE:
//esc = false;
if ( key ) {
esc = false; esc = false;
} else {
esc = true;
}
break; break;
case KeyEvent.VK_A: case KeyEvent.VK_A:
key = false; key = false;
@@ -78,9 +83,9 @@ public class KeyBindings extends KeyAdapter {
case KeyEvent.VK_DOWN: case KeyEvent.VK_DOWN:
down = true; down = true;
break; break;
case KeyEvent.VK_ESCAPE: // case KeyEvent.VK_ESCAPE:
esc = true; // esc = true;
break; // break;
case KeyEvent.VK_A: case KeyEvent.VK_A:
if(((MapGrid.getGridCell(Main.player01.getGridLocation().x, Main.player01.getGridLocation().y).isTrigger() if(((MapGrid.getGridCell(Main.player01.getGridLocation().x, Main.player01.getGridLocation().y).isTrigger()
&& !HardewareManipulate.getHardware(MapGrid.getGridCell(Main.player01.getGridLocation().x, Main.player01.getGridLocation().y).getCorrespondingHardwareToTrigger()))&&!key)&&ActionControl.getKeyA()){ && !HardewareManipulate.getHardware(MapGrid.getGridCell(Main.player01.getGridLocation().x, Main.player01.getGridLocation().y).getCorrespondingHardwareToTrigger()))&&!key)&&ActionControl.getKeyA()){
@@ -190,8 +195,8 @@ public class KeyBindings extends KeyAdapter {
player.animate = true; player.animate = true;
} }
if (isESC()) { if (isESC()) {
System.out.println("ESC pressed.");
Main.pause(); Main.pause();
esc=false;
} }
} }