petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r4249) -Codechange: Replace more occurences of 16 by TILE_SIZE and of 8 by TILE_HEIGHT. Reverted one change from the previous commit because it was faulty

Browse Source
This commit is contained in:
celestar
2006-04-03 09:07:21 +00:00
parent 3aa1e38be6
commit cc87f682b9
15 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
industry_cmd.c
View File

@@ -941,7 +941,7 @@ static void PlantFarmField(TileIndex tile)
int type;
if (_opt.landscape == LT_HILLY) {
if (GetTileZ(tile) + 16 >= _opt.snow_line)
if (GetTileZ(tile) + TILE_HEIGHT * 2 >= _opt.snow_line)
return;
}
@@ -1162,7 +1162,7 @@ static bool CheckNewIndustry_Oil(TileIndex tile, int type)
if (_game_mode == GM_EDITOR && _ignore_restrictions) return true;
if (_game_mode == GM_EDITOR && type != IT_OIL_RIG) return true;
if ((type != IT_OIL_RIG || TileHeight(tile) == 0) &&
DistanceFromEdge(TILE_ADDXY(tile, 1, 1)) < TILE_SIZE) return true;
DistanceFromEdge(TILE_ADDXY(tile, 1, 1)) < 16) return true;
_error_message = STR_483B_CAN_ONLY_BE_POSITIONED;
return false;
@@ -1171,7 +1171,7 @@ static bool CheckNewIndustry_Oil(TileIndex tile, int type)
static bool CheckNewIndustry_Farm(TileIndex tile, int type)
{
if (_opt.landscape == LT_HILLY) {
if (GetTileZ(tile) + 16 >= _opt.snow_line) {
if (GetTileZ(tile) + TILE_HEIGHT * 2 >= _opt.snow_line) {
_error_message = STR_0239_SITE_UNSUITABLE;
return false;
}