diff options
| author | rubidium <rubidium@openttd.org> | 2008-05-25 12:57:39 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-05-25 12:57:39 +0000 |
| commit | ce821b1adac69e91598f48217da42405ca08eb34 (patch) | |
| tree | 025594bdaef0e1efcf18e01f88e9d25a469cdb7c /src/openttd.cpp | |
| parent | 4ea34e778c4ae194f147b28c327d011207b126ed (diff) | |
| download | openttd-ce821b1adac69e91598f48217da42405ca08eb34.tar.xz | |
(svn r13242) -Codechange: remove _opt_ptr.
Diffstat (limited to 'src/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 0466f0716..2b64822a1 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -330,7 +330,6 @@ static void LoadIntroGame() { _game_mode = GM_MENU; - _opt_ptr = &_opt_newgame; ResetGRFConfig(false); /* Setup main window */ @@ -584,7 +583,6 @@ int ttd_main(int argc, char *argv[]) ScanNewGRFFiles(); - _opt_ptr = &_opt_newgame; ResetGRFConfig(false); /* XXX - ugly hack, if diff_level is 9, it means we got no setting from the config file */ @@ -769,8 +767,7 @@ static void StartScenario() ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); } - _opt_ptr = &_opt; - _opt_ptr->diff = _opt_newgame.diff; + _opt.diff = _opt_newgame.diff; _opt.diff_level = _opt_newgame.diff_level; /* Inititalize data */ @@ -877,7 +874,6 @@ void SwitchMode(int new_mode) break; case SM_LOAD: { /* Load game, Play Scenario */ - _opt_ptr = &_opt; ResetGRFConfig(true); ResetWindowSystem(); @@ -921,8 +917,6 @@ void SwitchMode(int new_mode) case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */ if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR, NO_DIRECTORY)) { - _opt_ptr = &_opt; - SetLocalPlayer(OWNER_NONE); _patches_newgame.starting_year = _cur_year; } else { |