diff options
author | terkhen <terkhen@openttd.org> | 2010-08-09 10:59:30 +0000 |
---|---|---|
committer | terkhen <terkhen@openttd.org> | 2010-08-09 10:59:30 +0000 |
commit | 78fd08c7b252876ee93beb2a9d8a3833c454cac6 (patch) | |
tree | 432f84b17ab0c189db64cf63b47bdc73b53796da /src/newgrf_commons.h | |
parent | 7f1425c333327858dcd48db7c2718cd1d9d777c7 (diff) | |
download | openttd-78fd08c7b252876ee93beb2a9d8a3833c454cac6.tar.xz |
(svn r20424) -Fix: Rename members of TileContext (TC_NORMAL conflicted with an existing define on MinGW).
Diffstat (limited to 'src/newgrf_commons.h')
-rw-r--r-- | src/newgrf_commons.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/newgrf_commons.h b/src/newgrf_commons.h index a260eb0d5..5d575973f 100644 --- a/src/newgrf_commons.h +++ b/src/newgrf_commons.h @@ -19,9 +19,9 @@ /** Contextx for tile accesses */ enum TileContext { - TC_NORMAL, ///< Nothing special. - TC_UPPER_HALFTILE, ///< Querying information about the upper part of a tile with halftile foundation. - TC_ON_BRIDGE, ///< Querying information about stuff on the bridge (via some bridgehead). + TCX_NORMAL, ///< Nothing special. + TCX_UPPER_HALFTILE, ///< Querying information about the upper part of a tile with halftile foundation. + TCX_ON_BRIDGE, ///< Querying information about stuff on the bridge (via some bridgehead). }; /** @@ -131,7 +131,7 @@ extern IndustryTileOverrideManager _industile_mngr; extern AirportOverrideManager _airport_mngr; extern AirportTileOverrideManager _airporttile_mngr; -uint32 GetTerrainType(TileIndex tile, TileContext context = TC_NORMAL); +uint32 GetTerrainType(TileIndex tile, TileContext context = TCX_NORMAL); TileIndex GetNearbyTile(byte parameter, TileIndex tile); uint32 GetNearbyTileInformation(TileIndex tile); |