summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2012-12-05 19:35:38 +0000
committerfrosch <frosch@openttd.org>2012-12-05 19:35:38 +0000
commite43bf5dabdb4a62b4e6b6812db422b962b4eaaf1 (patch)
tree6701005ef52a18c62ca5f79f3d34d130cc92418d /src/script
parent22dc45738d2a3a9634693e43dbbf95d948142b83 (diff)
downloadopenttd-e43bf5dabdb4a62b4e6b6812db422b962b4eaaf1.tar.xz
(svn r24788) -Change: Detach script settings from difficulty settings. Always allow changing all script settings without setting difficulty to custom.
Diffstat (limited to 'src/script')
-rw-r--r--src/script/script_config.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp
index 46f13cd0c..7260febdf 100644
--- a/src/script/script_config.cpp
+++ b/src/script/script_config.cpp
@@ -86,11 +86,6 @@ void ScriptConfig::ClearConfigList()
int ScriptConfig::GetSetting(const char *name) const
{
- /* Return default values if the difficulty is not set to Custom */
- if (GetGameSettings().difficulty.diff_level != SP_CUSTOM) {
- return this->info->GetSettingDefaultValue(name);
- }
-
SettingValueList::const_iterator it = this->settings.find(name);
if (it == this->settings.end()) return this->info->GetSettingDefaultValue(name);
return (*it).second;