diff -r 9ea0c89fbb58 -r de031d2aed47 disaster_cmd.c --- a/disaster_cmd.c Sat Jun 25 06:15:43 2005 +0000 +++ b/disaster_cmd.c Sat Jun 25 16:44:57 2005 +0000 @@ -627,10 +627,10 @@ EV_EXPLOSION_SMALL); } - BEGIN_TILE_LOOP(tile,6,6,v->tile - TILE_XY(3,3)) + BEGIN_TILE_LOOP(tile, 6, 6, v->tile - TileDiffXY(3, 3)) tile = TILE_MASK(tile); DisasterClearSquare(tile); - END_TILE_LOOP(tile,6,6,v->tile - TILE_XY(3,3)) + END_TILE_LOOP(tile, 6, 6, v->tile - TileDiffXY(3, 3)) } } @@ -744,7 +744,7 @@ x = TileX(Random()) * 16 + 8; InitializeDisasterVehicle(v, x, 0, 135, 3, 2); - v->dest_tile = TILE_XY(MapSizeX() / 2, MapSizeY() / 2); + v->dest_tile = TileXY(MapSizeX() / 2, MapSizeY() / 2); v->age = 0; // Allocate shadow too? @@ -846,7 +846,7 @@ y = MapMaxX() * 16 - 1; InitializeDisasterVehicle(v, x, y, 135, 7, 9); - v->dest_tile = TILE_XY(MapSizeX() / 2, MapSizeY() / 2); + v->dest_tile = TileXY(MapSizeX() / 2, MapSizeY() / 2); v->age = 0; // Allocate shadow too? @@ -912,7 +912,7 @@ SetDParam(0, i->town->index); AddNewsItem(STR_B005_COAL_MINE_SUBSIDENCE_LEAVES, - NEWS_FLAGS(NM_THIN,NF_VIEWPORT|NF_TILE,NT_ACCIDENT,0), i->xy + TILE_XY(1,1), 0); + NEWS_FLAGS(NM_THIN,NF_VIEWPORT|NF_TILE,NT_ACCIDENT,0), i->xy + TileDiffXY(1, 1), 0); { TileIndex tile = i->xy;