diff options
| author | frosch <frosch@openttd.org> | 2021-01-12 22:11:12 +0100 |
|---|---|---|
| committer | frosch <github@elsenhans.name> | 2021-02-14 23:14:07 +0100 |
| commit | 4ce941bbc2ac7f2d40d46909af4a3f75fe24ecef (patch) | |
| tree | aa11f2f738ee1b7ff3be8b91d01c691e87798290 /src/town_cmd.cpp | |
| parent | d17226910d319cb552edc5f43c4c4315109dbe04 (diff) | |
| download | openttd-4ce941bbc2ac7f2d40d46909af4a3f75fe24ecef.tar.xz | |
Codechange: turn a constant variable into a real constant.
Diffstat (limited to 'src/town_cmd.cpp')
| -rw-r--r-- | src/town_cmd.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index c2d148a1a..a37c36ed7 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1841,15 +1841,10 @@ static void DoCreateTown(Town *t, TileIndex tile, uint32 townnameparts, TownSize t->exclusive_counter = 0; t->statues = 0; - extern int _nb_orig_names; - if (_settings_game.game_creation.town_name < _nb_orig_names) { - /* Original town name */ - t->townnamegrfid = 0; - t->townnametype = SPECSTR_TOWNNAME_START + _settings_game.game_creation.town_name; - } else { - /* Newgrf town name */ - t->townnamegrfid = GetGRFTownNameId(_settings_game.game_creation.town_name - _nb_orig_names); - t->townnametype = GetGRFTownNameType(_settings_game.game_creation.town_name - _nb_orig_names); + { + TownNameParams tnp(_settings_game.game_creation.town_name); + t->townnamegrfid = tnp.grfid; + t->townnametype = tnp.type; } t->townnameparts = townnameparts; |