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

(svn r132) -Fix: [1014278] TileAddWrap() gave wrong results. Fixed now.

Browse Source
This commit is contained in:
truelight
2004-08-24 12:54:37 +00:00
parent c32166a5c9
commit a0ba5a7939
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
functions.h
View File

@@ -28,7 +28,7 @@ void ClickTile(uint tile);
void GetTileDesc(uint tile, TileDesc *td); void GetTileDesc(uint tile, TileDesc *td);
void DrawTile(TileInfo *ti); void DrawTile(TileInfo *ti);
uint TileAddWrap(TileIndex tile, int add); uint TileAddWrap(TileIndex tile, int addx, int addy);
enum { enum {
TILE_WRAPPED = (uint)-1 TILE_WRAPPED = (uint)-1
}; };

6
industry_cmd.c
View File

@@ -969,7 +969,7 @@ static void MaybePlantFarmField(Industry *i)
{ {
uint tile; uint tile;
if (CHANCE16(1,8)) { if (CHANCE16(1,8)) {
tile = TileAddWrap(i->xy, TILE_XY(i->width>>1, i->height>>1) + (Random()&TILE_XY(31,31))-TILE_XY(16,16)); tile = TileAddWrap(i->xy, ((i->width>>1) + Random() % 31 - 16), ((i->height>>1) + Random() % 31 - 16));
if (tile != TILE_WRAPPED) if (tile != TILE_WRAPPED)
PlantFarmField(tile); PlantFarmField(tile);
} }
@@ -1473,10 +1473,10 @@ static void DoCreateNewIndustry(Industry *i, uint tile, int type, const Industry
if (i->type == IT_FARM || i->type == IT_FARM_2) { if (i->type == IT_FARM || i->type == IT_FARM_2) {
tile = i->xy + TILE_XY((i->width >> 1), (i->height >> 1)); tile = i->xy + TILE_XY((i->width >> 1), (i->height >> 1));
for(j=0; j!=50; j++) { for(j=0; j!=50; j++) {
uint new_tile = TileAddWrap(tile, (Random() & TILE_XY(31,31)) - TILE_XY(16,16)); uint new_tile = TileAddWrap(tile, Random() % 31 - 16, Random() % 31 - 16);
if (new_tile != TILE_WRAPPED) if (new_tile != TILE_WRAPPED)
PlantFarmField(new_tile); PlantFarmField(new_tile);
} }
} }
_industry_sort_dirty = true; _industry_sort_dirty = true;
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0); InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0);

19
landscape.c
View File

@@ -742,11 +742,22 @@ TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng)
); );
} }
uint TileAddWrap(TileIndex tile, int add) // This function checks if we add addx/addy to tile, if we
// do wrap around the edges. For example, tile = (10,2) and
// addx = +3 and addy = -4. This function will now return
// TILE_WRAPPED, because the y is wrapped. This is needed in
// for example, farmland. When the tile is not wrapped,
// the result will be tile + TILE_XY(addx, addy)
uint TileAddWrap(TileIndex tile, int addx, int addy)
{ {
uint t = tile + add; int x, y;
if (t < TILES_X * TILE_Y_MAX && GET_TILE_X(t) != TILE_X_MAX) x = GET_TILE_X(tile) + addx;
return t; y = GET_TILE_Y(tile) + addy;
// Are we about to wrap?
if (x > 0 && x < TILE_X_MAX && y > 0 && y < TILE_Y_MAX)
return tile + TILE_XY(addx, addy);
return TILE_WRAPPED; return TILE_WRAPPED;
} }