cpp/openttd-patchpack/source Changeset - r16951:cc90f5512419

Changeset - r16951:cc90f5512419

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

yexo - 13 years ago 2011-01-02 12:52:37
yexo@openttd.org

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

2 files changed with 3 insertions and 3 deletions:

src/ai/ai_config.cpp

src/ai/ai_info.cpp

0 comments (0 inline, 0 general)

src/ai/ai_config.cpp

➞

Show inline comments

@@ @@ -108,10 +108,10 @@ int AIConfig::GetSetting(const char *nam @@
+{
 	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 */
-	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) {
 			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 1: return AI::START_NEXT_MEDIUM;
 				case 2: return AI::START_NEXT_HARD;

src/ai/ai_info.cpp

➞

Show inline comments

@@ @@ -338,7 +338,7 @@ int AIInfo::GetSettingDefaultValue(const @@
 	for (AIConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		if (strcmp((*it).name, name) != 0) continue;
 		/* 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 1: return (*it).medium_value;
 			case 2: return (*it).hard_value;

0 comments (0 inline, 0 general)