Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r4262) -Codechange: use IsClearWaterTile instead of some "home-brewn" marco. town_cmd is now map access free

Browse Source
This commit is contained in:
celestar 2006-04-03 15:11:17 +00:00
parent 84a5c861c8
commit 5a449e49fe
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
town_cmd.c
View File

@ -23,6 +23,7 @@
#include "economy.h" #include "economy.h"
#include "gui.h" #include "gui.h"
#include "unmovable_map.h" #include "unmovable_map.h"
#include "water_map.h"
#include "variables.h" #include "variables.h"
#include "bridge.h" #include "bridge.h"
@ -545,8 +546,6 @@ static void LevelTownLand(TileIndex tile)
} }
} }
#define IS_WATER_TILE(t) (IsTileType((t), MP_WATER) && _m[(t)].m5 == 0)
static void GrowTownInTile(TileIndex* tile_ptr, RoadBits mask, int block, Town* t1) static void GrowTownInTile(TileIndex* tile_ptr, RoadBits mask, int block, Town* t1)
{ {
RoadBits rcmd; RoadBits rcmd;
@ -621,7 +620,7 @@ static void GrowTownInTile(TileIndex* tile_ptr, RoadBits mask, int block, Town*
tmptile = TILE_ADD(tile, ToTileIndexDiff(_roadblock_tileadd[i])); tmptile = TILE_ADD(tile, ToTileIndexDiff(_roadblock_tileadd[i]));
// Don't do it if it reaches to water. // Don't do it if it reaches to water.
if (IS_WATER_TILE(tmptile)) return; if (IsClearWaterTile(tmptile)) return;
// Build a house at the edge. 60% chance or // Build a house at the edge. 60% chance or
// always ok if no road allowed. // always ok if no road allowed.
@ -643,7 +642,7 @@ static void GrowTownInTile(TileIndex* tile_ptr, RoadBits mask, int block, Town*
} }
// Return if a water tile // Return if a water tile
if (IsTileType(tile, MP_WATER) && _m[tile].m5 == 0) return; if (IsClearWaterTile(tile)) return;
// Determine direction of slope, // Determine direction of slope,
// and build a road if not a special slope. // and build a road if not a special slope.
@ -669,7 +668,7 @@ build_road_and_exit:
if (++j == 0) if (++j == 0)
goto build_road_and_exit; goto build_road_and_exit;
tmptile = TILE_MASK(tmptile + TileOffsByDir(i)); tmptile = TILE_MASK(tmptile + TileOffsByDir(i));
} while (IS_WATER_TILE(tmptile)); } while (IsClearWaterTile(tmptile));
// no water tiles in between? // no water tiles in between?
if (j == -10) if (j == -10)
@ -691,8 +690,6 @@ build_road_and_exit:
} while (--j != 0); } while (--j != 0);
} }
} }
#undef IS_WATER_TILE
// Returns true if a house was built, or no if the build failed. // Returns true if a house was built, or no if the build failed.
static int GrowTownAtRoad(Town *t, TileIndex tile) static int GrowTownAtRoad(Town *t, TileIndex tile)