--- a/industry_cmd.c	Mon Jan 03 12:56:22 2005 +0000
+++ b/industry_cmd.c	Mon Jan 03 14:07:49 2005 +0000
@@ -1212,8 +1212,8 @@
 
 static bool CheckSuitableIndustryPos(uint tile)
 {
-	int x = GET_TILE_X(tile);
-	int y = GET_TILE_Y(tile);
+	uint x = GET_TILE_X(tile);
+	uint y = GET_TILE_Y(tile);
 
 	if ( x < 2 || y < 2 || x > MapMaxX() - 3 || y > MapMaxY() - 3) {
 		_error_message = STR_0239_SITE_UNSUITABLE;

--- a/landscape.c	Mon Jan 03 12:56:22 2005 +0000
+++ b/landscape.c	Mon Jan 03 14:07:49 2005 +0000
@@ -512,7 +512,7 @@
 		}
 		tile++;
 		if (GET_TILE_X(tile) == MapMaxX()) {
-			tile += TILE_XY(-MapMaxX(), 1);
+			tile += TILE_XY(-(int)MapMaxX(), 1);
 			if (GET_TILE_Y(tile) == MapMaxY())
 				break;
 		}
@@ -525,7 +525,7 @@
 static void GenerateTerrain(int type, int flag)
 {
 	uint32 r;
-	int x,y;
+	uint x,y;
 	int w,h;
 	byte *p,*tile;
 	byte direction;
@@ -747,12 +747,12 @@
 //  the result will be tile + TILE_XY(addx, addy)
 uint TileAddWrap(TileIndex tile, int addx, int addy)
 {
-	int x, y;
+	uint x, y;
 	x = GET_TILE_X(tile) + addx;
 	y = GET_TILE_Y(tile) + addy;
 
 	// Are we about to wrap?
-	if (x > 0 && x < MapMaxX() && y > 0 && y < MapMaxY())
+	if (x < MapMaxX() && y < MapMaxY())
 		return tile + TILE_XY(addx, addy);
 
 	return TILE_WRAPPED;

--- a/ttd.c	Mon Jan 03 12:56:22 2005 +0000
+++ b/ttd.c	Mon Jan 03 14:07:49 2005 +0000
@@ -1082,7 +1082,7 @@
 			ShowScreenshotResult(MakeScreenshot());
 			break;
 		case 2: // make large screenshot
-			ShowScreenshotResult(MakeWorldScreenshot(-MapMaxX() * 32, 0, MapMaxX() * 64, TILES_Y * 32, 0));
+			ShowScreenshotResult(MakeWorldScreenshot(-(int)MapMaxX() * 32, 0, MapMaxX() * 64, TILES_Y * 32, 0));
 			break;
 		}
 	}

--- a/window.c	Mon Jan 03 12:56:22 2005 +0000
+++ b/window.c	Mon Jan 03 14:07:49 2005 +0000
@@ -1042,9 +1042,9 @@
 		hvx = hx * -4 + hy * 8;
 		hvy = hx *  4 + hy * 8;
 		if (x < -hvx) { x = -hvx; sub = 0; }
-		if (x > MapMaxX() * 16 - hvx) { x = MapMaxX() * 16 - hvx; sub = 0; }
+		if (x > (int)MapMaxX() * 16 - hvx) { x = MapMaxX() * 16 - hvx; sub = 0; }
 		if (y < -hvy) { y = -hvy; sub = 0; }
-		if (y > MapMaxY() * 16 - hvy) { y = MapMaxY() * 16 - hvy; sub = 0; }
+		if (y > (int)MapMaxY() * 16 - hvy) { y = MapMaxY() * 16 - hvy; sub = 0; }
 
 		WP(w,smallmap_d).scroll_x = x;
 		WP(w,smallmap_d).scroll_y = y;