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

(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style

Browse Source
This commit is contained in:
skidd13
2007-11-24 10:38:43 +00:00
parent 64246a2775
commit bf959f926f
34 changed files with 118 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/water_map.h
View File

@@ -31,9 +31,9 @@ static inline WaterTileType GetWaterTileType(TileIndex t)
if (_m[t].m5 == 0) return WATER_TILE_CLEAR;
if (_m[t].m5 == 1) return WATER_TILE_COAST;
if (IS_INT_INSIDE(_m[t].m5, LOCK_MIDDLE, LOCK_END)) return WATER_TILE_LOCK;
if (IsInsideMM(_m[t].m5, LOCK_MIDDLE, LOCK_END)) return WATER_TILE_LOCK;
assert(IS_INT_INSIDE(_m[t].m5, DEPOT_NORTH, DEPOT_END));
assert(IsInsideMM(_m[t].m5, DEPOT_NORTH, DEPOT_END));
return WATER_TILE_DEPOT;
}
@@ -72,7 +72,7 @@ static inline TileIndex GetOtherShipDepotTile(TileIndex t)
static inline TileIndex IsShipDepot(TileIndex t)
{
return IS_INT_INSIDE(_m[t].m5, DEPOT_NORTH, DEPOT_END);
return IsInsideMM(_m[t].m5, DEPOT_NORTH, DEPOT_END);
}
static inline Axis GetShipDepotAxis(TileIndex t)