diff --git a/HeatUp/src/de/heatup/ui/KeyBindings.java b/HeatUp/src/de/heatup/ui/KeyBindings.java index 49e5368..07c5b6d 100644 --- a/HeatUp/src/de/heatup/ui/KeyBindings.java +++ b/HeatUp/src/de/heatup/ui/KeyBindings.java @@ -42,8 +42,7 @@ public class KeyBindings extends KeyAdapter { down = false; break; case KeyEvent.VK_ESCAPE: - //esc = false; - if ( key ) { + if ( esc ) { esc = false; } else { esc = true; @@ -83,9 +82,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()){ @@ -97,7 +96,7 @@ public class KeyBindings extends KeyAdapter { if(ActionWatcher.getAction()&&!key){ if(ActionControl.getOption()==1){ if(ActionControl.getSmash()=='Q'){ - ActionControl.setProgressBarTimer(progressBarTimer); + ActionControl.setProgressBarTimer(progressBarTimer); } }else if(!ActionControl.getKeySequenceFail()){ if(ActionControl.getSequence()[ActionControl.getCount()]=='Q'){ @@ -195,6 +194,7 @@ public class KeyBindings extends KeyAdapter { player.animate = true; } if (isESC()) { + //System.out.println("ESC pressed."); Main.pause(); esc=false; }