Fixed an issue with the facing of the player direction

Fixed an issue where the player is facing the last way they were before the encount a wall
Moved around collision code

Author: redomar

src/com/redomar/game/entities/Dummy.java

@@ -33,6 +33,8 @@ public void tick() {
 		if (players.size() > 0) {
 			followMovementAI(getX(), getY(), Game.getPlayer().getX(), Game
 					.getPlayer().getY(), xa, ya, this);
+		}else{
+			isMoving = false;
 		}
 
 		setSwim(new Swim(level, getX(), getY()));
@@ -62,6 +64,9 @@ public void render(Screen screen) {
 		} else if (movingDir > 1) {
 			xTile += 4 + ((numSteps >> walkingSpeed) & 1) * 2;
 			flipTop = (movingDir - 1) % 2;
+			if(!isMoving){
+				xTile = 4;
+			}
 		}
 
 		int modifier = 8 * scale;
@@ -109,39 +114,6 @@ public void render(Screen screen) {
 		}
 	}
 
-	public boolean hasCollided(int xa, int ya) {
-		int xMin = 0;
-		int xMax = 7;
-		int yMin = 3;
-		int yMax = 7;
-
-		for (int x = xMin; x < xMax; x++) {
-			if (isSolid(xa, ya, x, yMin)) {
-				return true;
-			}
-		}
-
-		for (int x = xMin; x < xMax; x++) {
-			if (isSolid(xa, ya, x, yMax)) {
-				return true;
-			}
-		}
-
-		for (int y = yMin; y < yMax; y++) {
-			if (isSolid(xa, ya, xMin, y)) {
-				return true;
-			}
-		}
-
-		for (int y = yMin; y < yMax; y++) {
-			if (isSolid(xa, ya, xMax, y)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	public Swim getSwim() {
 		return swim;
 	}

src/com/redomar/game/entities/Mob.java

@@ -43,25 +43,57 @@ public void move(int xa, int ya) {
 		//2 = Facing Left
 		//3 = Facing Right
 
+		if (ya < 0) {
+			movingDir = 0;
+		}
+		if (ya > 0) {
+			movingDir = 1;
+		}
+		if (xa < 0) {
+			movingDir = 2;
+		}
+		if (xa > 0) {
+			movingDir = 3;
+		}
+		
 		if (!hasCollided(xa, ya)) {
-			if (ya < 0) {
-				movingDir = 0;
+			setX(getX() + xa * (int) speed);
+			setY(getY() + ya * (int) speed);
+		}
+	}
+
+	public boolean hasCollided(int xa, int ya){
+		int xMin = 0;
+		int xMax = 7;
+		int yMin = 3;
+		int yMax = 7;
+
+		for (int x = xMin; x < xMax; x++) {
+			if (isSolid(xa, ya, x, yMin)) {
+				return true;
 			}
-			if (ya > 0) {
-				movingDir = 1;
+		}
+
+		for (int x = xMin; x < xMax; x++) {
+			if (isSolid(xa, ya, x, yMax)) {
+				return true;
 			}
-			if (xa < 0) {
-				movingDir = 2;
+		}
+
+		for (int y = yMin; y < yMax; y++) {
+			if (isSolid(xa, ya, xMin, y)) {
+				return true;
 			}
-			if (xa > 0) {
-				movingDir = 3;
+		}
+
+		for (int y = yMin; y < yMax; y++) {
+			if (isSolid(xa, ya, xMax, y)) {
+				return true;
 			}
-			setX(getX() + xa * (int) speed);
-			setY(getY() + ya * (int) speed);
 		}
-	}
 
-	public abstract boolean hasCollided(int xa, int ya);
+		return false;
+	}
 
 	protected boolean isSolid(int xa, int ya, int x, int y) {
 

src/com/redomar/game/entities/Player.java

@@ -161,39 +161,6 @@ public void render(Screen screen) {
 		}
 	}
 
-	public boolean hasCollided(int xa, int ya) {
-		int xMin = 0;
-		int xMax = 7;
-		int yMin = 3;
-		int yMax = 7;
-
-		for (int x = xMin; x < xMax; x++) {
-			if (isSolid(xa, ya, x, yMin)) {
-				return true;
-			}
-		}
-
-		for (int x = xMin; x < xMax; x++) {
-			if (isSolid(xa, ya, x, yMax)) {
-				return true;
-			}
-		}
-
-		for (int y = yMin; y < yMax; y++) {
-			if (isSolid(xa, ya, xMin, y)) {
-				return true;
-			}
-		}
-
-		for (int y = yMin; y < yMax; y++) {
-			if (isSolid(xa, ya, xMax, y)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	public String getUsername() {
 		if (this.userName.isEmpty()) {
 			return guestPlayerName;