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

Remove: "generation_seed" from config, as it was a write-only value (#11927)

pull/11928/head
Patric Stout 2024-01-30 18:02:35 +01:00 committed by GitHub
parent a05b7acec8
commit 7acf78964f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/genworld.cpp
View File

@ -307,7 +307,7 @@ void GenerateWorld(GenWorldMode mode, uint size_x, uint size_y, bool reset_setti
_settings_game.construction.map_height_limit = std::max(MAP_HEIGHT_LIMIT_AUTO_MINIMUM, std::min(MAX_MAP_HEIGHT_LIMIT, estimated_height + MAP_HEIGHT_LIMIT_AUTO_CEILING_ROOM)); _settings_game.construction.map_height_limit = std::max(MAP_HEIGHT_LIMIT_AUTO_MINIMUM, std::min(MAX_MAP_HEIGHT_LIMIT, estimated_height + MAP_HEIGHT_LIMIT_AUTO_CEILING_ROOM));
} }
if (_settings_game.game_creation.generation_seed == GENERATE_NEW_SEED) _settings_game.game_creation.generation_seed = _settings_newgame.game_creation.generation_seed = InteractiveRandom(); if (_settings_game.game_creation.generation_seed == GENERATE_NEW_SEED) _settings_game.game_creation.generation_seed = InteractiveRandom();
/* Load the right landscape stuff, and the NewGRFs! */ /* Load the right landscape stuff, and the NewGRFs! */
GfxLoadSprites(); GfxLoadSprites();

2
src/openttd.cpp
View File

@ -430,7 +430,7 @@ struct AfterNewGRFScan : NewGRFScanCallback {
SetEffectVolume(_settings_client.music.effect_vol); SetEffectVolume(_settings_client.music.effect_vol);
if (startyear != CalendarTime::INVALID_YEAR) IConsoleSetSetting("game_creation.starting_year", startyear.base()); if (startyear != CalendarTime::INVALID_YEAR) IConsoleSetSetting("game_creation.starting_year", startyear.base());
if (generation_seed != GENERATE_NEW_SEED) _settings_newgame.game_creation.generation_seed = generation_seed; _settings_newgame.game_creation.generation_seed = generation_seed;
if (!dedicated_host.empty()) { if (!dedicated_host.empty()) {
_network_bind_list.clear(); _network_bind_list.clear();

9
src/settings.cpp
View File

@ -159,8 +159,10 @@ enum IniFileVersion : uint32_t {
IFV_GAME_TYPE, ///< 2 PR#9515 Convert server_advertise to server_game_type. IFV_GAME_TYPE, ///< 2 PR#9515 Convert server_advertise to server_game_type.
IFV_LINKGRAPH_SECONDS, ///< 3 PR#10610 Store linkgraph update intervals in seconds instead of days. IFV_LINKGRAPH_SECONDS, ///< 3 PR#10610 Store linkgraph update intervals in seconds instead of days.
IFV_NETWORK_PRIVATE_SETTINGS, ///< 4 PR#10762 Move no_http_content_downloads / use_relay_service to private settings. IFV_NETWORK_PRIVATE_SETTINGS, ///< 4 PR#10762 Move no_http_content_downloads / use_relay_service to private settings.
IFV_AUTOSAVE_RENAME, ///< 5 PR#11143 Renamed values of autosave to be in minutes. IFV_AUTOSAVE_RENAME, ///< 5 PR#11143 Renamed values of autosave to be in minutes.
IFV_RIGHT_CLICK_CLOSE, ///< 6 PR#10204 Add alternative right click to close windows setting. IFV_RIGHT_CLICK_CLOSE, ///< 6 PR#10204 Add alternative right click to close windows setting.
IFV_REMOVE_GENERATION_SEED, ///< 7 PR#11927 Remove "generation_seed" from configuration.
IFV_MAX_VERSION, ///< Highest possible ini-file version. IFV_MAX_VERSION, ///< Highest possible ini-file version.
}; };
@ -1483,6 +1485,13 @@ void SaveToConfig()
} }
} }
if (generic_version < IFV_REMOVE_GENERATION_SEED) {
IniGroup *game_creation = generic_ini.GetGroup("game_creation");
if (game_creation != nullptr) {
game_creation->RemoveItem("generation_seed");
}
}
/* These variables are migrated from generic ini to private ini now. */ /* These variables are migrated from generic ini to private ini now. */
if (generic_version < IFV_NETWORK_PRIVATE_SETTINGS) { if (generic_version < IFV_NETWORK_PRIVATE_SETTINGS) {
IniGroup *network = generic_ini.GetGroup("network"); IniGroup *network = generic_ini.GetGroup("network");

1
src/table/settings/world_settings.ini
View File

@ -199,6 +199,7 @@ strval = STR_VARIETY_NONE
var = game_creation.generation_seed var = game_creation.generation_seed
type = SLE_UINT32 type = SLE_UINT32
from = SLV_30 from = SLV_30
flags = SF_NOT_IN_CONFIG
def = GENERATE_NEW_SEED def = GENERATE_NEW_SEED
min = 0 min = 0
max = UINT32_MAX max = UINT32_MAX