Mercurial > hg > openttd

changeset 865:ed67682ff9d8 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r1346) -Fix: fix signed/unsigned warnings -Fix: latent removal of 2 lines from ttd.c which I forgot because the file was not saved :O
author darkvater <darkvater@openttd.org>
date Mon, 03 Jan 2005 19:09:45 +0000
parents 3598aa32991f
children a3347b0b24d1
files disaster_cmd.c misc.c ttd.c
diffstat 3 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/disaster_cmd.c
+++ b/disaster_cmd.c
@@ -178,7 +178,7 @@
 					0);
 			}
 		}
-		if (v->y_pos >= (MapSizeY() + 9) * 16 - 1)
+		if (v->y_pos >= ((int)MapSizeY() + 9) * 16 - 1)
 			DeleteDisasterVeh(v);
 		return;
 	}
@@ -416,7 +416,7 @@
 	GetNewVehiclePos(v, &gp);
 	SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos);
 
-	if (gp.x > MapSizeX() * 16 + 9*16 - 1) {
+	if (gp.x > (int)MapSizeX() * 16 + 9*16 - 1) {
 		DeleteDisasterVeh(v);
 		return;
 	}
@@ -594,7 +594,7 @@
 	GetNewVehiclePos(v, &gp);
 	SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos);
 
-	if (gp.x > MapSizeX() * 16 + 9*16 - 1) {
+	if (gp.x > (int)MapSizeX() * 16 + 9*16 - 1) {
 		DeleteDisasterVeh(v);
 		return;
 	}
--- a/misc.c
+++ b/misc.c
@@ -737,10 +737,10 @@
 
 extern uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line)
 {
-	int x = GET_TILE_X(tile) + (signed char)(add & 0xFF);
-	int y = GET_TILE_Y(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80);
+	uint x = GET_TILE_X(tile) + (signed char)(add & 0xFF);
+	uint y = GET_TILE_Y(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80);
 
-	if (x < 0 || y < 0 || x >= MapSizeX() || y >= MapSizeY()) {
+	if (x >= MapSizeX() || y >= MapSizeY()) {
 		char buf[512];
 
 		sprintf(buf, "TILE_ADD(%s) when adding 0x%.4X and %d failed", exp, tile, add);
--- a/ttd.c
+++ b/ttd.c
@@ -1240,8 +1240,6 @@
 		BEGIN_TILE_LOOP(tile_cur, w, h, tile)
 			if (IS_TILETYPE(tile_cur, MP_WATER) && _map_owner[tile_cur] >= MAX_PLAYERS)
 				_map_owner[tile_cur] = OWNER_WATER;
-			if (!IS_TILETYPE(tile_cur, MP_WATER) && _map_owner[tile_cur] == OWNER_WATER)
-				_map_owner[tile_cur] = OWNER_NONE;
 		END_TILE_LOOP(tile_cur, w, h, tile)
 	}