summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordarkvater <darkvater@openttd.org>2005-01-03 14:07:49 +0000
committerdarkvater <darkvater@openttd.org>2005-01-03 14:07:49 +0000
commit39f8b82640675d4810b9e4817ad09c7cb7bd4022 (patch)
tree1e6578e0e541a96bc27287df36c3604a74ff140e
parent32bfe0dddde81d016cb8de15e6a41bca3506d7be (diff)
downloadopenttd-39f8b82640675d4810b9e4817ad09c7cb7bd4022.tar.xz
(svn r1338) -Fix: fix signed/unsigned warnings introduced when ditching the macros for map querying.
-rw-r--r--industry_cmd.c4
-rw-r--r--landscape.c8
-rw-r--r--ttd.c2
-rw-r--r--window.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/industry_cmd.c b/industry_cmd.c
index 707f7c66b..aae700653 100644
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -1212,8 +1212,8 @@ static CheckNewIndustryProc * const _check_new_industry_procs[] = {
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;
diff --git a/landscape.c b/landscape.c
index b99ff6066..e9c1f85f1 100644
--- a/landscape.c
+++ b/landscape.c
@@ -512,7 +512,7 @@ void ConvertGroundTilesIntoWaterTiles()
}
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 const byte _genterrain_tbl_2[5] = { 0, 0, 0, 0, 33 };
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 @@ TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng)
// 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;
diff --git a/ttd.c b/ttd.c
index 5aa13aff0..cf5a021c8 100644
--- a/ttd.c
+++ b/ttd.c
@@ -1082,7 +1082,7 @@ void GameLoop()
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;
}
}
diff --git a/window.c b/window.c
index 7e98e8470..a11adbe05 100644
--- a/window.c
+++ b/window.c
@@ -1042,9 +1042,9 @@ stop_capt:;
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;