dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r1338) -Fix: fix signed/unsigned warnings introduced when ditching the macros for map querying.

Browse Source
This commit is contained in:
darkvater
2005-01-03 14:07:49 +00:00
parent 32bfe0dddd
commit 39f8b82640
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
industry_cmd.c
View File

@@ -1212,8 +1212,8 @@ static CheckNewIndustryProc * const _check_new_industry_procs[] = {
static bool CheckSuitableIndustryPos(uint tile) static bool CheckSuitableIndustryPos(uint tile)
{ {
int x = GET_TILE_X(tile); uint x = GET_TILE_X(tile);
int y = GET_TILE_Y(tile); uint y = GET_TILE_Y(tile);
if ( x < 2 || y < 2 || x > MapMaxX() - 3 || y > MapMaxY() - 3) { if ( x < 2 || y < 2 || x > MapMaxX() - 3 || y > MapMaxY() - 3) {
_error_message = STR_0239_SITE_UNSUITABLE; _error_message = STR_0239_SITE_UNSUITABLE;

8
landscape.c
View File

@@ -512,7 +512,7 @@ void ConvertGroundTilesIntoWaterTiles()
} }
tile++; tile++;
if (GET_TILE_X(tile) == MapMaxX()) { if (GET_TILE_X(tile) == MapMaxX()) {
tile += TILE_XY(-MapMaxX(), 1); tile += TILE_XY(-(int)MapMaxX(), 1);
if (GET_TILE_Y(tile) == MapMaxY()) if (GET_TILE_Y(tile) == MapMaxY())
break; break;
} }
@@ -525,7 +525,7 @@ static const byte _genterrain_tbl_2[5] = { 0, 0, 0, 0, 33 };
static void GenerateTerrain(int type, int flag) static void GenerateTerrain(int type, int flag)
{ {
uint32 r; uint32 r;
int x,y; uint x,y;
int w,h; int w,h;
byte *p,*tile; byte *p,*tile;
byte direction; byte direction;
@@ -747,12 +747,12 @@ TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng)
// the result will be tile + TILE_XY(addx, addy) // the result will be tile + TILE_XY(addx, addy)
uint TileAddWrap(TileIndex tile, int addx, int addy) uint TileAddWrap(TileIndex tile, int addx, int addy)
{ {
int x, y; uint x, y;
x = GET_TILE_X(tile) + addx; x = GET_TILE_X(tile) + addx;
y = GET_TILE_Y(tile) + addy; y = GET_TILE_Y(tile) + addy;
// Are we about to wrap? // 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 + TILE_XY(addx, addy);
return TILE_WRAPPED; return TILE_WRAPPED;

2
ttd.c
View File

@@ -1082,7 +1082,7 @@ void GameLoop()
ShowScreenshotResult(MakeScreenshot()); ShowScreenshotResult(MakeScreenshot());
break; break;
case 2: // make large screenshot 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; break;
} }
} }

4
window.c
View File

@@ -1042,9 +1042,9 @@ stop_capt:;
hvx = hx * -4 + hy * 8; hvx = hx * -4 + hy * 8;
hvy = hx * 4 + hy * 8; hvy = hx * 4 + hy * 8;
if (x < -hvx) { x = -hvx; sub = 0; } 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 < -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_x = x;
WP(w,smallmap_d).scroll_y = y; WP(w,smallmap_d).scroll_y = y;