aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorMax Horn2010-03-29 20:31:23 +0000
committerMax Horn2010-03-29 20:31:23 +0000
commit4bac9e1b752e92318ff1d5497ec1d7aa0f2786be (patch)
tree51a91527e39d3cca88a45e26afa60d79639a6b29 /engines/kyra
parent2872f197d81df8a804546207dc8388d7f4f87997 (diff)
downloadscummvm-rg350-4bac9e1b752e92318ff1d5497ec1d7aa0f2786be.tar.gz
scummvm-rg350-4bac9e1b752e92318ff1d5497ec1d7aa0f2786be.tar.bz2
scummvm-rg350-4bac9e1b752e92318ff1d5497ec1d7aa0f2786be.zip
COMMON: Cleanup ConfigManager code
* get rid of ConfigManager::_emptyString * get rid of ConfigManager::Domain::get (use getVal instead) * remove some dead code svn-id: r48417
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/detection.cpp4
-rw-r--r--engines/kyra/kyra_v1.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index be3cd2bf3a..6e9359e7fc 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -1355,7 +1355,7 @@ void KyraMetaEngine::removeSaveState(const char *target, int slot) const {
// In Kyra games slot 0 can't be deleted, it's for restarting the game(s).
// An exception makes Lands of Lore here, it does not have any way to restart the
// game except via its main menu.
- if (slot == 0 && !ConfMan.getDomain(target)->get("gameid").equalsIgnoreCase("lol"))
+ if (slot == 0 && !ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol"))
return;
Common::String filename = Kyra::KyraEngine_v1::getSavegameFilename(target, slot);
@@ -1376,7 +1376,7 @@ SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int s
if (error == Kyra::KyraEngine_v1::kRSHENoError) {
SaveStateDescriptor desc(slot, header.description);
- bool lolGame = ConfMan.getDomain(target)->get("gameid").equalsIgnoreCase("lol");
+ bool lolGame = ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol");
// Slot 0 is used for the 'restart game' save in all three Kyrandia games, thus
// we prevent it from being deleted.
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index bd8e1295ca..4c87ff4173 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -489,7 +489,7 @@ void KyraEngine_v1::registerDefaultSettings() {
// the global subtitles settings, we're using this hack to enable subtitles
// for fan translations
const Common::ConfigManager::Domain *cur = ConfMan.getActiveDomain();
- if (!cur || (cur && cur->get("subtitles").empty()))
+ if (!cur || (cur && cur->getVal("subtitles").empty()))
ConfMan.setBool("subtitles", true);
}
}