From 2b8f5c9acd538a8ba56bb1d4f949737aa39e4987 Mon Sep 17 00:00:00 2001
From: toksikk <sykikk+github@gmail.com>
Date: Fri, 21 Nov 2014 15:00:13 +0100
Subject: [PATCH] =?UTF-8?q?Diverse=20Klassen=20angepasst.=20CollisionHandl?=
 =?UTF-8?q?er=20spam=20deaktiviert=20bis=20wir=20ein=20Spielende=20impleme?=
 =?UTF-8?q?ntiert=20haben=20bei=20Treffer=20durch=20Gegner.=20GameLoopD=20?=
 =?UTF-8?q?Tick=20hinzugef=C3=BCgt=20f=C3=BCr=20StatusPanel=20HardwareRese?=
 =?UTF-8?q?tTimers=20modifier=20manipulation=20des=20statuspanels=20implem?=
 =?UTF-8?q?entiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HeatUp/src/de/heatup/mapengine/CollisionHandler.java | 2 +-
 HeatUp/src/de/heatup/testing/GameLoopD.java          | 1 +
 HeatUp/src/de/heatup/timers/HardwareResetTimers.java | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/HeatUp/src/de/heatup/mapengine/CollisionHandler.java b/HeatUp/src/de/heatup/mapengine/CollisionHandler.java
index ed64e57..5b05984 100644
--- a/HeatUp/src/de/heatup/mapengine/CollisionHandler.java
+++ b/HeatUp/src/de/heatup/mapengine/CollisionHandler.java
@@ -92,7 +92,7 @@ public class CollisionHandler {
 	public static void tick() {
 		for (int i=1; i<movingObjects.size();i++) {
 			if (movingObjects.get(0).getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObjects.get(0).getGridLocation().y == movingObjects.get(i).getGridLocation().y) {
-				Logger.write("COLLISION WITH ENEMY");
+//				Logger.write("COLLISION WITH ENEMY");
 			}
 		}
 	}
diff --git a/HeatUp/src/de/heatup/testing/GameLoopD.java b/HeatUp/src/de/heatup/testing/GameLoopD.java
index 4c50c33..8f9fdc7 100644
--- a/HeatUp/src/de/heatup/testing/GameLoopD.java
+++ b/HeatUp/src/de/heatup/testing/GameLoopD.java
@@ -270,6 +270,7 @@ public class GameLoopD extends JFrame implements Runnable {
 			opponent05.tick();
 			opponent06.tick();
 			CollisionHandler.tick();
+			StatusPanelAdder.tick();
 		}
 	}
 	// alles was animiert wird hier rein (paints)
diff --git a/HeatUp/src/de/heatup/timers/HardwareResetTimers.java b/HeatUp/src/de/heatup/timers/HardwareResetTimers.java
index e8603c4..dba72cb 100644
--- a/HeatUp/src/de/heatup/timers/HardwareResetTimers.java
+++ b/HeatUp/src/de/heatup/timers/HardwareResetTimers.java
@@ -26,7 +26,7 @@ public class HardwareResetTimers {
 				if (HardwareResetTickstamps.get(i).equals(tickCount)) {
 					Logger.write("Hardware "+i+" reset");
 					HardewareManipulate.resetHardware(i);
-					//StatusPanelAdder.reduceMod();
+					StatusPanelAdder.reduceMod();
 				}
 			}
 		}
@@ -41,6 +41,6 @@ public class HardwareResetTimers {
 			resetTimestamp = resetTimestamp % tickRoundMax;
 		}
 		HardwareResetTickstamps.put(c, resetTimestamp);
-		//StatusPanelAdder.raiseMod();
+		StatusPanelAdder.raiseMod();
 	}
 }