From 6435ef52a76cd9733fc2b97fc5c83512c4d240f2 Mon Sep 17 00:00:00 2001 From: andreas Date: Tue, 13 Jan 2015 12:03:55 +0100 Subject: [PATCH] =?UTF-8?q?Tastenkombination=20anpassung=20f=C3=BCr=20Keyb?= =?UTF-8?q?indings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/KeyBindings.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/KeyBindings.java b/HeatUp/src/de/heatup/ui/KeyBindings.java index c2f390d..dfc1273 100644 --- a/HeatUp/src/de/heatup/ui/KeyBindings.java +++ b/HeatUp/src/de/heatup/ui/KeyBindings.java @@ -2,9 +2,11 @@ package de.heatup.ui; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; + import de.heatup.mapengine.CollisionHandler; import de.heatup.mapengine.MapGrid; import de.heatup.objects.Player; +import de.heatup.timers.HardwareResetTimers; import de.heatup.ui.actionPanel.ActionControl; import de.heatup.ui.actionPanel.ActionWatcher; import de.heatup.ui.actionPanel.HardewareManipulate; @@ -81,8 +83,8 @@ public class KeyBindings extends KeyAdapter { down = 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()){ + if(((MapGrid.getGridCell(PanelBuilder.getPlayer().getGridLocation().x, PanelBuilder.getPlayer().getGridLocation().y).isTrigger() + && !HardewareManipulate.getHardware(MapGrid.getGridCell(PanelBuilder.getPlayer().getGridLocation().x, PanelBuilder.getPlayer().getGridLocation().y).getCorrespondingHardwareToTrigger()))&&!key)&&ActionControl.getKeyA()){ ActionWatcher.setAction(true); key=true; }