Changed the player postition from int to double

redomar · redomar · commit d645fba5cac1 · 2014-03-22T16:05:48.000Z
appened some code back into int
diff --git a/src/com/redomar/game/Game.java b/src/com/redomar/game/Game.java
@@ -117,7 +117,7 @@ public void init() {
 		setMap("/levels/custom_level.png");
 		setMap(1);
 		Packet00Login loginPacket = new Packet00Login(player.getUsername(),
-				player.getX(), player.getY());
+				(int) player.getX(), (int) player.getY());
 
 		if (socketServer != null) {
 			socketServer.addConnection((PlayerMP) getPlayer(), loginPacket);
@@ -234,8 +234,8 @@ public void render() {
 			return;
 		}
 
-		int xOffset = getPlayer().getX() - (screen.getWidth() / 2);
-		int yOffset = getPlayer().getY() - (screen.getHeight() / 2);
+		int xOffset = (int) getPlayer().getX() - (screen.getWidth() / 2);
+		int yOffset = (int) getPlayer().getY() - (screen.getHeight() / 2);
 
 		getLevel().renderTiles(screen, xOffset, yOffset);
 
diff --git a/src/com/redomar/game/entities/Dummy.java b/src/com/redomar/game/entities/Dummy.java
@@ -31,13 +31,13 @@ public void tick() {
 
 		List<Player> players = level.getPlayers(this, 10);
 		if (players.size() > 0) {
-			followMovementAI(getX(), getY(), Game.getPlayer().getX(), Game
+			followMovementAI((int) getX(), (int) getY(), (int) Game.getPlayer().getX(), (int) Game
 					.getPlayer().getY(), xa, ya, this);
 		}else{
 			isMoving = false;
 		}
 
-		setSwim(new Swim(level, getX(), getY()));
+		setSwim(new Swim(level, (int) getX(), (int) getY()));
 		swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
 		isSwimming = swimType[0];
 		isMagma = swimType[1];
@@ -70,8 +70,8 @@ public void render(Screen screen) {
 		}
 
 		int modifier = 8 * scale;
-		int xOffset = getX() - modifier / 2;
-		int yOffset = getY() - modifier / 2 - 4;
+		int xOffset = (int) getX() - modifier / 2;
+		int yOffset = (int) getY() - modifier / 2 - 4;
 
 		if (isSwimming || isMagma || isMuddy) {
 			swimColour = getSwim().waveCols(isSwimming, isMagma, isMuddy);
diff --git a/src/com/redomar/game/entities/Entity.java b/src/com/redomar/game/entities/Entity.java
@@ -5,7 +5,7 @@
 
 public abstract class Entity {
 
-	protected int x, y;
+	protected double x, y;
 	protected LevelHandler level;
 
 	public Entity(LevelHandler level) {
@@ -20,15 +20,15 @@ public final void init(LevelHandler level) {
 
 	public abstract void render(Screen screen);
 
-	public int getX() {
+	public double getX() {
 		return x;
 	}
 
 	public void setX(int x) {
 		this.x = x;
 	}
 
-	public int getY() {
+	public double getY() {
 		return y;
 	}
 
diff --git a/src/com/redomar/game/entities/Mob.java b/src/com/redomar/game/entities/Mob.java
@@ -58,13 +58,13 @@ public void move(int xa, int ya) {
 		
 		for (int x = 0; x < Math.abs(xa); x++) {
 			if (!hasCollided(abs(xa), ya)) {
-				setX(getX() + abs(xa) * (int) speed);
+				this.x += abs(xa) * (int) speed;
 			}
 		}
 		
 		for (int y = 0; y < Math.abs(ya); y++) {
 			if (!hasCollided(xa, abs(ya))) {
-				setY(getY() + abs(ya) * (int) speed);
+				this.y += abs(ya) * (int) speed;
 			}
 		}
 	}
@@ -105,8 +105,8 @@ public boolean hasCollided(int xa, int ya){
 	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;
+			double xt = ((x + xa) - c % 2 * 8) / 8;
+			double 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);
@@ -127,9 +127,9 @@ protected boolean isSolid(int xa, int ya, int x, int y) {
 			return false;
 		}
 
-		Tile lastTile = level.getTile((this.getX() + x) >> 3,
-				(this.getY() + y) >> 3);
-		Tile newtTile = level.getTile((this.getX() + x + xa) >> 3, (this.getY()
+		Tile lastTile = level.getTile(((int) this.getX() + x) >> 3,
+				((int) this.getY() + y) >> 3);
+		Tile newtTile = level.getTile(((int) this.getX() + x + xa) >> 3, ((int) this.getY()
 				+ y + ya) >> 3);
 
 		if (!lastTile.equals(newtTile) && newtTile.isSolid()) {
diff --git a/src/com/redomar/game/entities/Player.java b/src/com/redomar/game/entities/Player.java
@@ -61,7 +61,7 @@ public void tick() {
 			isMoving = true;
 
 			Packet02Move packet = new Packet02Move(this.getUsername(),
-					this.getX(), this.getY(), this.numSteps, this.isMoving,
+					(int) this.getX(), (int) this.getY(), this.numSteps, this.isMoving,
 					this.movingDir);
 			Game.getGame();
 			packet.writeData(Game.getSocketClient());
@@ -70,13 +70,13 @@ public void tick() {
 			isMoving = false;
 		}
 
-		setSwim(new Swim(level, getX(), getY()));
+		setSwim(new Swim(level, (int) getX(), (int) getY()));
 		swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
 		isSwimming = swimType[0];
 		isMagma = swimType[1];
 		isMuddy = swimType[2];
 
-		if (level.getTile(this.getX() >> 3, this.getY() >> 3).getId() == 11) {
+		if (level.getTile((int) this.getX() >> 3, (int) this.getY() >> 3).getId() == 11) {
 			changeLevels = true;
 		}
 
@@ -108,8 +108,8 @@ public void render(Screen screen) {
 		}
 
 		int modifier = 8 * scale;
-		int xOffset = getX() - modifier / 2;
-		int yOffset = getY() - modifier / 2 - 4;
+		int xOffset = (int) getX() - modifier / 2;
+		int yOffset = (int) getY() - modifier / 2 - 4;
 
 		if (changeLevels) {
 			Game.setChangeLevel(true);
diff --git a/src/com/redomar/game/level/LevelHandler.java b/src/com/redomar/game/level/LevelHandler.java
@@ -196,12 +196,12 @@ public void movePlayer(String username, int x, int y, int numSteps,
 	
 	public List<Entity> getEntities(Entity e, int radius){
 		List<Entity> result = new ArrayList<Entity>();
-		int ex = e.getX();
-		int ey = e.getY();
+		int ex = (int) e.getX();
+		int ey = (int) e.getY();
 		for (int i = 0; i < entities.size(); i++) {
 			Entity entity = entities.get(i);
-			int x = entity.getX();
-			int y = entity.getY();
+			int x = (int) entity.getX();
+			int y = (int) entity.getY();
 			
 			int dx = Math.abs(x - ex);
 			int dy = Math.abs(y - ey);
diff --git a/src/com/redomar/game/net/GameServer.java b/src/com/redomar/game/net/GameServer.java
@@ -114,7 +114,7 @@ public void addConnection(PlayerMP player, Packet00Login packet) {
 			} else {
 				sendData(packet.getData(), p.ipAddess, p.port);
 
-				packet = new Packet00Login(p.getUsername(), p.getX(), p.getY());
+				packet = new Packet00Login(p.getUsername(), (int) p.getX(), (int) p.getY());
 				sendData(packet.getData(), player.ipAddess, player.port);
 			}
 		}
diff --git a/src/com/redomar/game/objects/Inventory.java b/src/com/redomar/game/objects/Inventory.java
@@ -12,8 +12,8 @@ public class Inventory {
 	private static InventoryWindow inv_window = new InventoryWindow();
 
 	public static void activate() {
-		x = Game.getPlayer().getX();
-		y = Game.getPlayer().getY();
+		x = (int) Game.getPlayer().getX();
+		y = (int) Game.getPlayer().getY();
 
 		if (Game.getLevel().getTile(x >> 3, y >> 3).getId() == 8) {
 			if (!reset) {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`public abstract class Entity {`
`7`	`7`
`8`		`- protected int x, y;`
	`8`	`+ protected double x, y;`
`9`	`9`	`protected LevelHandler level;`
`10`	`10`
`11`	`11`	`public Entity(LevelHandler level) {`
`@@ -20,15 +20,15 @@ public final void init(LevelHandler level) {`
`20`	`20`
`21`	`21`	`public abstract void render(Screen screen);`
`22`	`22`
`23`		`- public int getX() {`
	`23`	`+ public double getX() {`
`24`	`24`	`return x;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public void setX(int x) {`
`28`	`28`	`this.x = x;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public int getY() {`
	`31`	`+ public double getY() {`
`32`	`32`	`return y;`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,13 @@ public void move(int xa, int ya) {`
`58`	`58`
`59`	`59`	`for (int x = 0; x < Math.abs(xa); x++) {`
`60`	`60`	`if (!hasCollided(abs(xa), ya)) {`
`61`		`- setX(getX() + abs(xa) * (int) speed);`
	`61`	`+ this.x += abs(xa) * (int) speed;`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`for (int y = 0; y < Math.abs(ya); y++) {`
`66`	`66`	`if (!hasCollided(xa, abs(ya))) {`
`67`		`- setY(getY() + abs(ya) * (int) speed);`
	`67`	`+ this.y += abs(ya) * (int) speed;`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
`@@ -105,8 +105,8 @@ public boolean hasCollided(int xa, int ya){`
`105`	`105`	`public boolean hasCollidedAlt(int xa, int ya){`
`106`	`106`	`boolean solid = false;`
`107`	`107`	`for (int c = 0; c < 4; c++) {`
`108`		`- int xt = ((x + xa) - c % 2 * 8) / 8;`
`109`		`- int yt = ((y + ya) - c / 2 * 8) / 8;`
	`108`	`+ double xt = ((x + xa) - c % 2 * 8) / 8;`
	`109`	`+ double yt = ((y + ya) - c / 2 * 8) / 8;`
`110`	`110`	`int ix = (int) Math.ceil(xt);`
`111`	`111`	`int iy = (int) Math.ceil(yt);`
`112`	`112`	`if (c % 2 == 0) ix = (int) Math.floor(xt);`
`@@ -127,9 +127,9 @@ protected boolean isSolid(int xa, int ya, int x, int y) {`
`127`	`127`	`return false;`
`128`	`128`	`}`
`129`	`129`
`130`		`- Tile lastTile = level.getTile((this.getX() + x) >> 3,`
`131`		`- (this.getY() + y) >> 3);`
`132`		`- Tile newtTile = level.getTile((this.getX() + x + xa) >> 3, (this.getY()`
	`130`	`+ Tile lastTile = level.getTile(((int) this.getX() + x) >> 3,`
	`131`	`+ ((int) this.getY() + y) >> 3);`
	`132`	`+ Tile newtTile = level.getTile(((int) this.getX() + x + xa) >> 3, ((int) this.getY()`
`133`	`133`	`+ y + ya) >> 3);`
`134`	`134`
`135`	`135`	`if (!lastTile.equals(newtTile) && newtTile.isSolid()) {`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public void addConnection(PlayerMP player, Packet00Login packet) {`
`114`	`114`	`} else {`
`115`	`115`	`sendData(packet.getData(), p.ipAddess, p.port);`
`116`	`116`
`117`		`- packet = new Packet00Login(p.getUsername(), p.getX(), p.getY());`
	`117`	`+ packet = new Packet00Login(p.getUsername(), (int) p.getX(), (int) p.getY());`
`118`	`118`	`sendData(packet.getData(), player.ipAddess, player.port);`
`119`	`119`	`}`
`120`	`120`	`}`