Merge branch 'master' of github.com:jokerx3/prp

HeatUp/src/de/heatup/testing/Opponent.java

@@ -55,25 +55,26 @@ 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() ) {
+					if ( CollisionHandler.checkCollision(this, 'd') ) {
 						this.move = false;
 					}
-					if ( MapGrid.getGridCell(this.getGridLocation().x, this.getGridLocation().y-1).isPath() ) {
+					if ( CollisionHandler.checkCollision(this, 'u') ) {
 						this.move = false;
 					}
 				}
 				if ( d == 'y' ) {
-					if ( MapGrid.getGridCell(this.getGridLocation().x-1, this.getGridLocation().y).isPath() ) {
+					if ( CollisionHandler.checkCollision(this, 'l') ) {
 						this.move = false;
 					}
-					if ( MapGrid.getGridCell(this.getGridLocation().x+1, this.getGridLocation().y).isPath() ) {
+					if ( CollisionHandler.checkCollision(this, 'r') ) {
 						this.move = false;
 					}
 				}
 				
 				
+				
+				
 				// Umentscheiden oder weiter in die vorgegeben Richtung
 				if ( ! this.move ) {
 					//Logger.write("Redeciding...");
@@ -85,7 +86,7 @@ public class Opponent extends Player {
 					}
 
 				} else {
-					Logger.write("Moving...");					
+					//Logger.write("Moving...");					
 				}
 				
 				this.move = true;
@@ -119,7 +120,6 @@ public class Opponent extends Player {
 				}				
 				
 				if (CollisionHandler.checkCollision(this, charDir)) {
-					System.out.println("Kollision!");
 					this.setGridLocation(testX, testY);
 					this.prevd = d;
 					this.previ = i;
@@ -156,18 +156,11 @@ public class Opponent extends Player {
 			}
 			if (stepCounter <= 0) {
 				stepCounter = 25;
-				
-				if ( ! MapGrid.getGridCell(newx,newy).isPath()) {
-					redecide = true;
-					animate = false;
-				} else {
-					animate = true;
-				}
+				redecide = true;
+				animate = false;
+			} else { 
+				animate = true; 
 			}
 		}
-		
-		
-		
 	}
-
 }