Merge branch 'npc-dev' into aside

Author: redomar

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

@@ -36,6 +36,13 @@ public void move(int xa, int ya) {
 			return;
 		}
 		numSteps++;
+		
+		//Moving Directions
+		//0 = Facing UP
+		//1 = Facing Down
+		//2 = Facing Left
+		//3 = Facing Right
+		
 		if (!hasCollided(xa, ya)) {
 			if (ya < 0) {
 				movingDir = 0;

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

@@ -100,6 +100,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;