dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15495) -Revert (r15383,r15422): Loading NewGRFs depends on correct settings, but the economy can only be started after loading NewGRFs. In short: r15383 causes more problems then it's worth.

Browse Source
This commit is contained in:
yexo
2009-02-14 23:17:32 +00:00
parent a6350c0287
commit 6381cbeeae
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/genworld_gui.cpp
View File

@@ -248,8 +248,8 @@ void StartGeneratingLandscape(glwp_modes mode)
{
DeleteAllNonVitalWindows();
/* Copy the settings needed for creating a new map. */
_settings_game.game_creation = _settings_newgame.game_creation;
/* Copy all XXX_newgame to XXX when coming from outside the editor */
MakeNewgameSettingsLive();
ResetGRFConfig(true);
SndPlayFx(SND_15_BEEP);
@@ -442,6 +442,8 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
break;
case GLAND_GENERATE_BUTTON: // Generate
MakeNewgameSettingsLive();
if (mode == GLWP_HEIGHTMAP &&
(this->x * 2 < (1U << _settings_newgame.game_creation.map_x) ||
this->x / 2 > (1U << _settings_newgame.game_creation.map_x) ||