updated colision and player movement code

Author: redomar

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

@@ -56,9 +56,16 @@ public void move(int xa, int ya) {
 			movingDir = 3;
 		}
 
-		if (!hasCollided(xa, ya)) {
-			setX(getX() + xa * (int) speed);
-			setY(getY() + ya * (int) speed);
+		for (int x = 0; x < Math.abs(xa); x++) {
+			if (!hasCollided(abs(xa), ya)) {
+				setX(getX() + abs(xa) * (int) speed);
+			}
+		}
+		
+		for (int y = 0; y < Math.abs(ya); y++) {
+			if (!hasCollided(xa, abs(ya))) {
+				setY(getY() + abs(ya) * (int) speed);
+			}
 		}
 	}
 
@@ -94,6 +101,25 @@ public boolean hasCollided(int xa, int ya){
 
 		return false;
 	}
+	
+	public boolean hasCollidedAlt(int xa, int ya){
+		boolean solid = false;
+		for (int c = 0; c < 4; c++) {
+			int xt = ((x + xa) - c % 2 * 8) / 8;
+			int yt = ((y + ya) - c / 2 * 8) / 8;
+			int ix = (int) Math.ceil(xt);
+			int iy = (int) Math.ceil(yt);
+			if (c % 2 == 0) ix = (int) Math.floor(xt);
+			if (c / 2 == 0) iy = (int) Math.floor(yt);
+			if(level.getTile(ix, iy).isSolid()) solid = true;
+		}
+		return solid;
+	}
+	
+	private int abs(int i){
+		if (i < 0) return -1;
+		return 1;
+	}
 
 	protected boolean isSolid(int xa, int ya, int x, int y) {
 

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

@@ -17,6 +17,8 @@ public class Player extends Mob {
 	private static Name customeName = new Name();
 	private Swim swim;
 
+	private static double speed = 1;
+	
 	private int colour, shirtCol, faceCol;
 	private int tickCount = 0;
 	private String userName;
@@ -27,7 +29,7 @@ public class Player extends Mob {
 
 	public Player(LevelHandler level, int x, int y, InputHandler input,
 			String userName,  int shirtCol,	int faceCol) {
-		super(level, "Player", x, y, 1);
+		super(level, "Player", x, y, speed);
 		this.input = input;
 		this.userName = userName;
 		this.faceCol = faceCol;
@@ -188,4 +190,12 @@ public void setSwim(Swim swim) {
 		this.swim = swim;
 	}
 
+	public static double getSpeed() {
+		return speed;
+	}
+
+	public static void setSpeed(double speed) {
+		Player.speed = speed;
+	}
+
 }