Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r10993) -Codechange: A few less magical numbers (skidd13)

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
belugas 17 years ago
parent ac838de385
commit 6212b29b23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
src/town_cmd.cpp
Unescape Escape View File

@ -672,7 +672,7 @@ static bool IsRoadAllowedHere(TileIndex tile, int dir)
/* No, try to build one in the direction. /* No, try to build one in the direction.
* if that fails clear the land, and if that fails exit. * if that fails clear the land, and if that fails exit.
* This is to make sure that we can build a road here later. */ * This is to make sure that we can build a road here later. */
if (CmdFailed(DoCommand(tile, (dir & 1 ? ROAD_X : ROAD_Y), 0, DC_AUTO, CMD_BUILD_ROAD)) && if (CmdFailed(DoCommand(tile, (dir & ROAD_NW ? ROAD_X : ROAD_Y), 0, DC_AUTO, CMD_BUILD_ROAD)) &&
CmdFailed(DoCommand(tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR))) CmdFailed(DoCommand(tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR)))
return false; return false;
} }
@ -695,7 +695,7 @@ no_slope:
/* If the tile is not a slope in the right direction, then /* If the tile is not a slope in the right direction, then
* maybe terraform some. */ * maybe terraform some. */
k = (dir & 1) ? SLOPE_NE : SLOPE_NW; k = (dir & ROAD_NW) ? SLOPE_NE : SLOPE_NW;
if (k != slope && ComplementSlope(k) != slope) { if (k != slope && ComplementSlope(k) != slope) {
uint32 r = Random(); uint32 r = Random();
@ -939,7 +939,7 @@ static void GrowTownInTile(TileIndex* tile_ptr, RoadBits mask, int block, Town*
* at any side of the new road. */ * at any side of the new road. */
} }
rcmd = (RoadBits)((1 << a) + (1 << b)); rcmd = (RoadBits)((ROAD_NW << a) + (ROAD_NW << b));
break; break;
} }
@ -961,7 +961,7 @@ static void GrowTownInTile(TileIndex* tile_ptr, RoadBits mask, int block, Town*
case TL_BETTER_ROADS: case TL_BETTER_ROADS:
case TL_ORIGINAL: case TL_ORIGINAL:
rcmd = (RoadBits)(1 << (block ^ 2)); rcmd = (RoadBits)(ROAD_NW << (block ^ 2));
break; break;
} }
} else { } else {
@ -1040,7 +1040,7 @@ static void GrowTownInTile(TileIndex* tile_ptr, RoadBits mask, int block, Town*
} }
_grow_town_result = 0; _grow_town_result = 0;
rcmd = (RoadBits)(1 << i); rcmd = (RoadBits)(ROAD_NW << i);
} }
/* Return if a water tile */ /* Return if a water tile */
@ -1138,7 +1138,7 @@ static int GrowTownAtRoad(Town *t, TileIndex tile)
/* Exclude the source position from the bitmask /* Exclude the source position from the bitmask
* and return if no more road blocks available */ * and return if no more road blocks available */
ClrBitT(mask, (block ^ 2)); ClrBitT(mask, (block ^ 2));
if (mask == 0) if (mask == ROAD_NONE)
return _grow_town_result; return _grow_town_result;
/* Select a random bit from the blockmask, walk a step /* Select a random bit from the blockmask, walk a step

Write Preview
Loading…
Cancel
Save