mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20418) -Fix [FS#4017](r20125): During world generation the snow-mapbits are not yet available, so test the snowline variable directly (as before).

release/1.1
frosch 2010-08-08 21:34:19 +00:00
parent 747634a687
commit a56f8ba801
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_commons.cpp
View File

@ -22,6 +22,7 @@
#include "station_map.h" #include "station_map.h"
#include "tree_map.h" #include "tree_map.h"
#include "tunnelbridge_map.h" #include "tunnelbridge_map.h"
#include "genworld.h"
#include "core/mem_func.hpp" #include "core/mem_func.hpp"
/** /**
@ -304,26 +305,36 @@ uint32 GetTerrainType(TileIndex tile, bool upper_halftile)
bool has_snow; bool has_snow;
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_CLEAR: case MP_CLEAR:
/* During map generation the snowstate may not be valid yet, as the tileloop may not have run yet. */
if (_generating_world) goto genworld;
has_snow = IsSnowTile(tile) && GetClearDensity(tile) >= 2; has_snow = IsSnowTile(tile) && GetClearDensity(tile) >= 2;
break; break;
case MP_RAILWAY: { case MP_RAILWAY: {
/* 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); RailGroundType ground = GetRailGroundType(tile);
has_snow = (ground == RAIL_GROUND_ICE_DESERT || (upper_halftile && ground == RAIL_GROUND_HALF_SNOW)); has_snow = (ground == RAIL_GROUND_ICE_DESERT || (upper_halftile && ground == RAIL_GROUND_HALF_SNOW));
break; break;
} }
case MP_ROAD: case MP_ROAD:
/* 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
has_snow = IsOnSnow(tile); has_snow = IsOnSnow(tile);
break; break;
case MP_TREES: { case MP_TREES: {
/* During map generation the snowstate may not be valid yet, as the tileloop may not have run yet. */
if (_generating_world) goto genworld;
TreeGround ground = GetTreeGround(tile); TreeGround ground = GetTreeGround(tile);
has_snow = (ground == TREE_GROUND_SNOW_DESERT || ground == TREE_GROUND_ROUGH_SNOW) && GetTreeDensity(tile) >= 2; has_snow = (ground == TREE_GROUND_SNOW_DESERT || ground == TREE_GROUND_ROUGH_SNOW) && GetTreeDensity(tile) >= 2;
break; break;
} }
case MP_TUNNELBRIDGE: case MP_TUNNELBRIDGE:
/* 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
has_snow = HasTunnelBridgeSnowOrDesert(tile); has_snow = HasTunnelBridgeSnowOrDesert(tile);
break; break;
@ -337,6 +348,7 @@ uint32 GetTerrainType(TileIndex tile, bool upper_halftile)
case MP_VOID: case MP_VOID:
case MP_WATER: case MP_WATER:
genworld:
has_snow = (GetTileZ(tile) > GetSnowLine()); has_snow = (GetTileZ(tile) > GetSnowLine());
break; break;