mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r13277) -Fix: opntitle 'jumping' to the temperate climate when closing the NewGRF settings window.
This commit is contained in:
parent
a0b14f02c8
commit
495ca8fdb9
|
@ -205,7 +205,7 @@ void StartGeneratingLandscape(glwp_modes mode)
|
|||
DeleteAllNonVitalWindows();
|
||||
|
||||
/* Copy all XXX_newgame to XXX when coming from outside the editor */
|
||||
UpdatePatches();
|
||||
_settings = _settings_newgame;
|
||||
ResetGRFConfig(true);
|
||||
|
||||
SndPlayFx(SND_15_BEEP);
|
||||
|
@ -377,7 +377,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
|
|||
break;
|
||||
|
||||
case GLAND_GENERATE_BUTTON: // Generate
|
||||
UpdatePatches();
|
||||
_settings = _settings_newgame;
|
||||
|
||||
if (_settings.economy.town_layout == TL_NO_ROADS) {
|
||||
ShowQuery(
|
||||
|
|
|
@ -588,10 +588,8 @@ int ttd_main(int argc, char *argv[])
|
|||
/* XXX - ugly hack, if diff_level is 9, it means we got no setting from the config file */
|
||||
if (_settings_newgame.difficulty.diff_level == 9) SetDifficultyLevel(0, &_settings_newgame.difficulty);
|
||||
|
||||
/* Make sure _patches is filled with _patches_newgame if we switch to a game directly */
|
||||
if (_switch_mode != SM_NONE) {
|
||||
UpdatePatches();
|
||||
}
|
||||
/* Make sure _settings is filled with _settings_newgame if we switch to a game directly */
|
||||
if (_switch_mode != SM_NONE) _settings = _settings_newgame;
|
||||
|
||||
/* initialize the ingame console */
|
||||
IConsoleInit();
|
||||
|
@ -1916,8 +1914,6 @@ bool AfterLoadGame()
|
|||
}
|
||||
}
|
||||
|
||||
if (CheckSavegameVersion(22)) UpdatePatches();
|
||||
|
||||
if (CheckSavegameVersion(25)) {
|
||||
Vehicle *v;
|
||||
FOR_ALL_VEHICLES(v) {
|
||||
|
|
|
@ -2265,22 +2265,16 @@ static void Save_PATS()
|
|||
|
||||
void CheckConfig()
|
||||
{
|
||||
// Increase old default values for pf_maxdepth and pf_maxlength
|
||||
// to support big networks.
|
||||
/*
|
||||
* Increase old default values for pf_maxdepth and pf_maxlength
|
||||
* to support big networks.
|
||||
*/
|
||||
if (_settings_newgame.pf.opf.pf_maxdepth == 16 && _settings_newgame.pf.opf.pf_maxlength == 512) {
|
||||
_settings_newgame.pf.opf.pf_maxdepth = 48;
|
||||
_settings_newgame.pf.opf.pf_maxlength = 4096;
|
||||
}
|
||||
}
|
||||
|
||||
void UpdatePatches()
|
||||
{
|
||||
/* Since old(er) savegames don't have any patches saved, we initialise
|
||||
* them with the default values just as it was in the old days.
|
||||
* Also new games need this copying-over */
|
||||
_settings = _settings_newgame; /* backwards compatibility */
|
||||
}
|
||||
|
||||
extern const ChunkHandler _setting_chunk_handlers[] = {
|
||||
{ 'OPTS', NULL, Load_OPTS, CH_RIFF},
|
||||
{ 'PATS', Save_PATS, Load_PATS, CH_RIFF | CH_LAST},
|
||||
|
|
|
@ -12,6 +12,5 @@ void IConsoleListPatches();
|
|||
void LoadFromConfig();
|
||||
void SaveToConfig();
|
||||
void CheckConfig();
|
||||
void UpdatePatches();
|
||||
|
||||
#endif /* SETTINGS_FUNC_H */
|
||||
|
|
Loading…
Reference in New Issue