cpp/openttd-patchpack/source Changeset - r15130:14678fa8b7ef

Changeset - r15130:14678fa8b7ef

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 14 years ago 2010-05-08 14:43:59
frosch@openttd.org

(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.

3 files changed with 12 insertions and 0 deletions:

src/landscape.cpp

src/saveload/afterload.cpp

src/tile_map.h

0 comments (0 inline, 0 general)

src/landscape.cpp

➞

Show inline comments

@@ @@ -831,6 +831,8 @@ static void CreateDesertOrRainForest() @@
 	for (TileIndex tile = 0; tile != MapSize(); ++tile) {
 		if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
 		if (!IsValidTile(tile)) continue;
 		for (data = _make_desert_or_rainforest_data;
 				data != endof(_make_desert_or_rainforest_data); ++data) {
 			TileIndex t = AddTileIndexDiffCWrap(tile, *data);
@@ @@ -849,6 +851,8 @@ static void CreateDesertOrRainForest() @@
 	for (TileIndex tile = 0; tile != MapSize(); ++tile) {
 		if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
 		if (!IsValidTile(tile)) continue;
 		for (data = _make_desert_or_rainforest_data;
 				data != endof(_make_desert_or_rainforest_data); ++data) {
 			TileIndex t = AddTileIndexDiffCWrap(tile, *data);

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -2101,6 +2101,13 @@ bool AfterLoadGame() @@
+		}
+	}
 	if (CheckSavegameVersion(141)) {
 		for (TileIndex t = 0; t < map_size; t++) {
 			/* Reset tropic zone for VOID tiles, they shall not have any. */
 			if (IsTileType(t, MP_VOID)) SetTropicZone(t, TROPICZONE_NORMAL);
+		}
+	}
 	/* Road stops is 'only' updating some caches */
 	AfterLoadRoadStops();
 	AfterLoadLabelMaps();

src/tile_map.h

➞

Show inline comments

@@ @@ -186,6 +186,7 @@ static inline bool IsTileOwner(TileIndex @@
 static inline void SetTropicZone(TileIndex tile, TropicZone type)
+{
 	assert(tile < MapSize());
 	assert(!IsTileType(tile, MP_VOID) || type == TROPICZONE_NORMAL);
 	SB(_m[tile].m6, 0, 2, type);
+}

0 comments (0 inline, 0 general)