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

(svn r20710) -Codechange: Clarify the name of some town generation variables.

release/1.1
terkhen 2010-09-01 18:52:27 +00:00
parent 7a5b995157
commit c6db763781
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/town_cmd.cpp
View File

@ -1773,12 +1773,12 @@ static const byte _num_initial_towns[4] = {5, 11, 23, 46}; // very low, low, no
*/ */
bool GenerateTowns(TownLayout layout) bool GenerateTowns(TownLayout layout)
{ {
uint num = 0; uint current_number = 0;
uint difficulty = _settings_game.difficulty.number_towns; uint difficulty = _settings_game.difficulty.number_towns;
uint n = (difficulty == (uint)CUSTOM_TOWN_NUMBER_DIFFICULTY) ? _settings_game.game_creation.custom_town_number : ScaleByMapSize(_num_initial_towns[difficulty] + (Random() & 7)); uint total = (difficulty == (uint)CUSTOM_TOWN_NUMBER_DIFFICULTY) ? _settings_game.game_creation.custom_town_number : ScaleByMapSize(_num_initial_towns[difficulty] + (Random() & 7));
uint32 townnameparts; uint32 townnameparts;
SetGeneratingWorldProgress(GWP_TOWN, n); SetGeneratingWorldProgress(GWP_TOWN, total);
/* First attempt will be made at creating the suggested number of towns. /* First attempt will be made at creating the suggested number of towns.
* Note that this is really a suggested value, not a required one. * Note that this is really a suggested value, not a required one.
@ -1789,12 +1789,12 @@ bool GenerateTowns(TownLayout layout)
/* Get a unique name for the town. */ /* Get a unique name for the town. */
if (!GenerateTownName(&townnameparts)) continue; if (!GenerateTownName(&townnameparts)) continue;
/* try 20 times to create a random-sized town for the first loop. */ /* try 20 times to create a random-sized town for the first loop. */
if (CreateRandomTown(20, townnameparts, TSZ_RANDOM, city, layout) != NULL) num++; // If creation was successful, raise a flag. if (CreateRandomTown(20, townnameparts, TSZ_RANDOM, city, layout) != NULL) current_number++; // If creation was successful, raise a flag.
} while (--n); } while (--total);
if (num != 0) return true; if (current_number != 0) return true;
/* If num is still zero at this point, it means that not a single town has been created. /* If current_number is still zero at this point, it means that not a single town has been created.
* So give it a last try, but now more aggressive */ * So give it a last try, but now more aggressive */
if (GenerateTownName(&townnameparts) && if (GenerateTownName(&townnameparts) &&
CreateRandomTown(10000, townnameparts, TSZ_RANDOM, _settings_game.economy.larger_towns != 0, layout) != NULL) { CreateRandomTown(10000, townnameparts, TSZ_RANDOM, _settings_game.economy.larger_towns != 0, layout) != NULL) {