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

(svn r21697) -Codechange: use GetGameSettings() in a few more places to enhance readability

release/1.1
yexo 2011-01-02 12:52:37 +00:00
parent b22945350f
commit 4ec6c19d44
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ai/ai_config.cpp
View File

@ -108,10 +108,10 @@ int AIConfig::GetSetting(const char *name) const
{ {
SettingValueList::const_iterator it = this->settings.find(name); SettingValueList::const_iterator it = this->settings.find(name);
/* Return the default value if the setting is not set, or if we are in a not-custom difficult level */ /* Return the default value if the setting is not set, or if we are in a not-custom difficult level */
if (it == this->settings.end() || ((_game_mode == GM_MENU) ? _settings_newgame.difficulty.diff_level : _settings_game.difficulty.diff_level) != 3) { if (it == this->settings.end() || GetGameSettings().difficulty.diff_level != 3) {
if (this->info == NULL) { if (this->info == NULL) {
assert(strcmp("start_date", name) == 0); assert(strcmp("start_date", name) == 0);
switch ((_game_mode == GM_MENU) ? _settings_newgame.difficulty.diff_level : _settings_game.difficulty.diff_level) { switch (GetGameSettings().difficulty.diff_level) {
case 0: return AI::START_NEXT_EASY; case 0: return AI::START_NEXT_EASY;
case 1: return AI::START_NEXT_MEDIUM; case 1: return AI::START_NEXT_MEDIUM;
case 2: return AI::START_NEXT_HARD; case 2: return AI::START_NEXT_HARD;

2
src/ai/ai_info.cpp
View File

@ -338,7 +338,7 @@ int AIInfo::GetSettingDefaultValue(const char *name) const
for (AIConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) { for (AIConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
if (strcmp((*it).name, name) != 0) continue; if (strcmp((*it).name, name) != 0) continue;
/* The default value depends on the difficulty level */ /* The default value depends on the difficulty level */
switch ((_game_mode == GM_MENU) ? _settings_newgame.difficulty.diff_level : _settings_game.difficulty.diff_level) { switch (GetGameSettings().difficulty.diff_level) {
case 0: return (*it).easy_value; case 0: return (*it).easy_value;
case 1: return (*it).medium_value; case 1: return (*it).medium_value;
case 2: return (*it).hard_value; case 2: return (*it).hard_value;