diff --git a/HeatUp/src/de/heatup/mapengine/CollisionHandler.java b/HeatUp/src/de/heatup/mapengine/CollisionHandler.java index 32a4e98..cbd6ae1 100644 --- a/HeatUp/src/de/heatup/mapengine/CollisionHandler.java +++ b/HeatUp/src/de/heatup/mapengine/CollisionHandler.java @@ -1,9 +1,12 @@ package de.heatup.mapengine; +import java.util.ArrayList; + import de.heatup.logging.Logger; import de.heatup.testing.Player; public class CollisionHandler { + private static ArrayList movingObjects = new ArrayList(); /** * Prüfe ob eine Kollision vorliegt * @param movingObject Kann alles sein, dass sich bewegt. Spieler oder KI. @@ -36,4 +39,7 @@ public class CollisionHandler { return true; } } + public static void addMovingObject(Player movingObject) { + movingObjects.add(movingObject); + } } diff --git a/HeatUp/src/de/heatup/testing/Player.java b/HeatUp/src/de/heatup/testing/Player.java index 27667bf..8981400 100644 --- a/HeatUp/src/de/heatup/testing/Player.java +++ b/HeatUp/src/de/heatup/testing/Player.java @@ -14,6 +14,7 @@ import javax.swing.JComponent; import de.heatup.cfg.Config; import de.heatup.logging.Logger; +import de.heatup.mapengine.CollisionHandler; public class Player extends JComponent { private static final long serialVersionUID = 1L; @@ -33,6 +34,10 @@ public class Player extends JComponent { int stepCounter = 25; private Point currentGridPosition; + public Player() { + CollisionHandler.addMovingObject(this); + } + public void setSpeedMultiplicator(int factor) { this.speedMultiplicator *= factor; }