da/HeatUp
1
0
Fork 0
mirror of https://github.com/jokerx3/HeatUp synced 2026-07-27 09:59:45 +02:00
Code Issues Releases Wiki Activity

ESC bindings angepasst

Browse Source
This commit is contained in:
andreas
2014-12-09 16:22:38 +01:00
parent 4108d5047f
commit c0f7c8c9ff
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/ui/KeyBindings.java
+6 -6
View File
@@ -42,8 +42,7 @@ public class KeyBindings extends KeyAdapter {
down = false; down = false;
break; break;
case KeyEvent.VK_ESCAPE: case KeyEvent.VK_ESCAPE:
//esc = false; if ( esc ) {
if ( key ) {
esc = false; esc = false;
} else { } else {
esc = true; esc = true;
@@ -83,9 +82,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()){
@@ -97,7 +96,7 @@ public class KeyBindings extends KeyAdapter {
if(ActionWatcher.getAction()&&!key){ if(ActionWatcher.getAction()&&!key){
if(ActionControl.getOption()==1){ if(ActionControl.getOption()==1){
if(ActionControl.getSmash()=='Q'){ if(ActionControl.getSmash()=='Q'){
ActionControl.setProgressBarTimer(progressBarTimer); ActionControl.setProgressBarTimer(progressBarTimer);
} }
}else if(!ActionControl.getKeySequenceFail()){ }else if(!ActionControl.getKeySequenceFail()){
if(ActionControl.getSequence()[ActionControl.getCount()]=='Q'){ if(ActionControl.getSequence()[ActionControl.getCount()]=='Q'){
@@ -195,6 +194,7 @@ 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; esc=false;
} }