From 0d76bfdc02910b8cbbf95327492181904bc6db9d Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 7 Nov 2014 15:23:23 +0100 Subject: [PATCH] Collision Handler in Opponent --- HeatUp/src/de/heatup/testing/Opponent.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/HeatUp/src/de/heatup/testing/Opponent.java b/HeatUp/src/de/heatup/testing/Opponent.java index 1e1fa87..1f1f80e 100644 --- a/HeatUp/src/de/heatup/testing/Opponent.java +++ b/HeatUp/src/de/heatup/testing/Opponent.java @@ -8,14 +8,12 @@ import javax.imageio.ImageIO; import de.heatup.cfg.Config; import de.heatup.logging.Logger; +import de.heatup.mapengine.CollisionHandler; import de.heatup.mapengine.MapGrid; import de.heatup.mapengine.MapGridCell; public class Opponent extends Player { - /** - * - */ private static final long serialVersionUID = 1L; private boolean redecide = true; // Nötig sobald der Schritt in die gewollte Richtung erfolgt ist private Random rand = new Random(); @@ -29,6 +27,10 @@ public class Opponent extends Player { private boolean blocked = false; private boolean move = false; private int blockedCounter = 0; + + public Opponent() { + CollisionHandler.addMovingObject(this); + } @Override protected void loadBufferedImage() { try { @@ -52,7 +54,6 @@ public class Opponent extends Player { this.prevX = this.getGridLocation().x; this.prevY = this.getGridLocation().y; - // Kreuzung erkennen if ( d == 'x' ) { if ( MapGrid.getGridCell(this.getGridLocation().x, this.getGridLocation().y+1).isPath() ) {