cpp/openttd-patchpack/source Changeset - r21220:5b27a41b688e

Changeset - r21220:5b27a41b688e

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 10 years ago 2014-02-06 20:42:09
rubidium@openttd.org

(svn r26308) -Fix-ish: do not try to build more towns/industries than the pool can hold (MJP)

2 files changed with 2 insertions and 1 deletions:

src/industry_cmd.cpp

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -1995,7 +1995,7 @@ static uint GetNumberOfIndustries() @@
 	assert(lengthof(numof_industry_table) == ID_END);
 	uint difficulty = (_game_mode != GM_EDITOR) ? _settings_game.difficulty.industry_density : (uint)ID_VERY_LOW;
 	return ScaleByMapSize(numof_industry_table[difficulty]);
+	return min(IndustryPool::MAX_SIZE, ScaleByMapSize(numof_industry_table[difficulty]));
+}
 /**

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -1880,6 +1880,7 @@ bool GenerateTowns(TownLayout layout) @@
 	uint current_number = 0;
 	uint difficulty = (_game_mode != GM_EDITOR) ? _settings_game.difficulty.number_towns : 0;
 	uint total = (difficulty == (uint)CUSTOM_TOWN_NUMBER_DIFFICULTY) ? _settings_game.game_creation.custom_town_number : ScaleByMapSize(_num_initial_towns[difficulty] + (Random() & 7));
 	total = min(TownPool::MAX_SIZE, total);
 	uint32 townnameparts;
 	SetGeneratingWorldProgress(GWP_TOWN, total);

0 comments (0 inline, 0 general)