petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r21695) -Codechange: add helper function to get the currently applicable GameSettings object

Browse Source
This commit is contained in:
yexo
2011-01-02 00:34:21 +00:00
parent a25d6c64dd
commit 3ca65ab7b3
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/settings_gui.cpp
View File

@@ -186,7 +186,7 @@ struct GameOptionsWindow : Window {
GameOptionsWindow(const WindowDesc *desc) : Window()
{
this->opt = (_game_mode == GM_MENU) ? &_settings_newgame : &_settings_game;
this->opt = &GetGameSettings();
this->reload = false;
this->InitNested(desc);
@@ -591,7 +591,7 @@ public:
/* Copy current settings (ingame or in intro) to temporary holding place
* change that when setting stuff, copy back on clicking 'OK' */
this->opt_mod_temp = (_game_mode == GM_MENU) ? _settings_newgame : _settings_game;
this->opt_mod_temp = GetGameSettings();
/* Setup disabled buttons when creating window
* disable all other difficulty buttons during gameplay except for 'custom' */
this->SetWidgetsDisabledState(_game_mode != GM_MENU,
@@ -696,7 +696,7 @@ public:
break;
case GDW_ACCEPT: { // Save button - save changes
GameSettings *opt_ptr = (_game_mode == GM_MENU) ? &_settings_newgame : &_settings_game;
GameSettings *opt_ptr = &GetGameSettings();
uint i;
GetSettingFromName("difficulty.diff_level", &i);
@@ -1526,7 +1526,7 @@ struct GameSettingsWindow : Window {
{
static bool first_time = true;
settings_ptr = (_game_mode == GM_MENU) ? &_settings_newgame : &_settings_game;
settings_ptr = &GetGameSettings();
/* Build up the dynamic settings-array only once per OpenTTD session */
if (first_time) {