cpp/openttd-patchpack/source Changeset - r6801:3c6b56e07296

Changeset - r6801:3c6b56e07296

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

belugas - 17 years ago 2007-06-05 01:49:08
belugas@openttd.org

(svn r10040) -Codechange: Make the function GetTerrainType public, as other functions require it

3 files changed with 19 insertions and 9 deletions:

src/newgrf_commons.cpp

src/newgrf_commons.h

src/newgrf_house.cpp

0 comments (0 inline, 0 general)

src/newgrf_commons.cpp

➞

Show inline comments

@@ @@ -6,6 +6,8 @@ @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "variables.h"
 #include "clear_map.h"
 #include "town.h"
 #include "industry.h"
 #include "newgrf.h"
@@ @@ -148,3 +150,18 @@ void HouseOverrideManager::SetEntitySpec @@
 		entity_overrides[i] = invalid_ID;
+	}
+}
 /** Function used by houses (and soon industries) to get information
  * on type of "terrain" the tile it is queries sits on.
  * @param tile TileIndex of the tile been queried
  * @return value corresponding to the grf expected format:
  *         Terrain type: 0 normal, 1 desert, 2 rainforest, 4 on or above snowline */
 uint32 GetTerrainType(TileIndex tile)
+{
 	switch (_opt.landscape) {
 		case LT_TROPIC: return GetTropicZone(tile) == TROPICZONE_DESERT ? 1 : 2;
 		case LT_ARCTIC: return (GetClearGround(tile) == CLEAR_SNOW) ? 4 : 0;
 		default:        return 0;
+	}
+}

src/newgrf_commons.h

➞

Show inline comments

@@ @@ -66,4 +66,6 @@ public: @@
 extern HouseOverrideManager _house_mngr;
 uint32 GetTerrainType(TileIndex tile);
 #endif /* NEWGRF_COMMONS_H */

src/newgrf_house.cpp

➞

Show inline comments

@@ @@ -169,15 +169,6 @@ static uint32 GetNumHouses(HouseID house @@
 	return map_class_count << 24 | town_class_count << 16 | map_id_count << 8 | town_id_count;
+}
 static uint32 GetTerrainType(TileIndex tile)
+{
 	switch (_opt.landscape) {
 		case LT_TROPIC: return GetTropicZone(tile) == TROPICZONE_DESERT ? 1 : 2;
 		case LT_ARCTIC: return GetTileZ(tile) >= GetSnowLine() ? 4 : 0;
 		default:        return 0;
+	}
+}
 static uint32 GetGRFParameter(HouseID house_id, byte parameter)
+{
 	const HouseSpec *hs = GetHouseSpecs(house_id);

0 comments (0 inline, 0 general)