From 4108d5047fd6f0dd943eacff880e38355a56d55e Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 8 Dec 2014 21:19:14 +0100 Subject: [PATCH] =?UTF-8?q?ESC-Probleme=20f=C3=BCr=20Pause=20behoben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/KeyBindings.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/KeyBindings.java b/HeatUp/src/de/heatup/ui/KeyBindings.java index caa6214..49e5368 100644 --- a/HeatUp/src/de/heatup/ui/KeyBindings.java +++ b/HeatUp/src/de/heatup/ui/KeyBindings.java @@ -42,7 +42,12 @@ public class KeyBindings extends KeyAdapter { down = false; break; case KeyEvent.VK_ESCAPE: - esc = false; + //esc = false; + if ( key ) { + esc = false; + } else { + esc = true; + } break; case KeyEvent.VK_A: key = false; @@ -78,9 +83,9 @@ public class KeyBindings extends KeyAdapter { case KeyEvent.VK_DOWN: down = true; break; - case KeyEvent.VK_ESCAPE: - esc = true; - break; +// case KeyEvent.VK_ESCAPE: +// esc = true; +// break; case KeyEvent.VK_A: 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()){ @@ -190,8 +195,8 @@ public class KeyBindings extends KeyAdapter { player.animate = true; } if (isESC()) { - System.out.println("ESC pressed."); Main.pause(); + esc=false; } }