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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/newgrf_commons.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp index 7306f28cc..a169b17e4 100644 --- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -314,7 +314,7 @@ uint32 GetTerrainType(TileIndex tile, TileContext context) /* During map generation the snowstate may not be valid yet, as the tileloop may not have run yet. */ if (_generating_world) goto genworld; // we do not care about foundations here RailGroundType ground = GetRailGroundType(tile); - has_snow = (ground == RAIL_GROUND_ICE_DESERT || (context == TC_UPPER_HALFTILE && ground == RAIL_GROUND_HALF_SNOW)); + has_snow = (ground == RAIL_GROUND_ICE_DESERT || (context == TCX_UPPER_HALFTILE && ground == RAIL_GROUND_HALF_SNOW)); break; } @@ -333,7 +333,7 @@ uint32 GetTerrainType(TileIndex tile, TileContext context) } case MP_TUNNELBRIDGE: - if (context == TC_ON_BRIDGE) { + if (context == TCX_ON_BRIDGE) { has_snow = (GetBridgeHeight(tile) > GetSnowLine()); } else { /* During map generation the snowstate may not be valid yet, as the tileloop may not have run yet. */ |