gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25853) -Codechange: Simplify SetupFarmFieldFence by replacing the Axis and north parameter with a direction parameter and taking adventage of the new unified SetFence function (cirdan, LordAro)

Browse Source
This commit is contained in:
zuu 2013-10-12 22:28:38 +00:00
parent fb5dc7762b
commit e50478c053
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/industry_cmd.cpp
View File

@ -956,8 +956,17 @@ static bool IsSuitableForFarmField(TileIndex tile, bool allow_fields)
} }
} }
static void SetupFarmFieldFence(TileIndex tile, int size, byte type, Axis direction, bool north) /**
* Build farm field fence
* @param tile the tile to position the fence on
* @param size the size of the field being planted in tiles
* @param type type of fence to set
* @param side the side of the tile to attempt placement
*/
static void SetupFarmFieldFence(TileIndex tile, int size, byte type, DiagDirection side)
{ {
TileIndexDiff diff = (DiagDirToAxis(side) == AXIS_Y ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
do { do {
tile = TILE_MASK(tile); tile = TILE_MASK(tile);
@ -966,22 +975,10 @@ static void SetupFarmFieldFence(TileIndex tile, int size, byte type, Axis direct
if (or_ == 1 && Chance16(1, 7)) or_ = 2; if (or_ == 1 && Chance16(1, 7)) or_ = 2;
if (direction == AXIS_X) { SetFence(tile, side, or_);
if (north) {
SetFence(tile, DIAGDIR_NW, or_);
} else {
SetFence(tile, DIAGDIR_SE, or_);
}
} else {
if (north) {
SetFence(tile, DIAGDIR_NE, or_);
} else {
SetFence(tile, DIAGDIR_SW, or_);
}
}
} }
tile += (direction == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1)); tile += diff;
} while (--size); } while (--size);
} }
@ -1030,10 +1027,10 @@ static void PlantFarmField(TileIndex tile, IndustryID industry)
type = _plantfarmfield_type[Random() & 0xF]; type = _plantfarmfield_type[Random() & 0xF];
} }
SetupFarmFieldFence(ta.tile, ta.h, type, AXIS_Y, true); SetupFarmFieldFence(ta.tile, ta.h, type, DIAGDIR_NE);
SetupFarmFieldFence(ta.tile, ta.w, type, AXIS_X, true); SetupFarmFieldFence(ta.tile, ta.w, type, DIAGDIR_NW);
SetupFarmFieldFence(ta.tile + TileDiffXY(ta.w - 1, 0), ta.h, type, AXIS_Y, false); SetupFarmFieldFence(ta.tile + TileDiffXY(ta.w - 1, 0), ta.h, type, DIAGDIR_SW);
SetupFarmFieldFence(ta.tile + TileDiffXY(0, ta.h - 1), ta.w, type, AXIS_X, false); SetupFarmFieldFence(ta.tile + TileDiffXY(0, ta.h - 1), ta.w, type, DIAGDIR_SE);
} }
void PlantRandomFarmField(const Industry *i) void PlantRandomFarmField(const Industry *i)