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 181e9b6cf9
commit 920b9eab9d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
landscape.c
View File

@@ -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;