aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/state.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-06 12:57:42 +0000
committerMax Horn2009-09-06 12:57:42 +0000
commitd04b5d2c9b46c1bf0ad8a7b93981eae301163cb3 (patch)
tree6dd83b676d66a3653e3d8d684f95175e363acae1 /engines/sci/engine/state.cpp
parentc0ff500b0a1a1595f2f88583c925758039e9b64c (diff)
downloadscummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.tar.gz
scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.tar.bz2
scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.zip
SCI: Rename resManager -> resMan; segManager -> segMan
svn-id: r43980
Diffstat (limited to 'engines/sci/engine/state.cpp')
-rw-r--r--engines/sci/engine/state.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 78ace4e6e7..4c513e9ee5 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -184,11 +184,9 @@ kLanguage EngineState::getLanguage() {
kLanguage lang = K_LANG_ENGLISH;
if (((SciEngine*)g_engine)->getKernel()->_selectorMap.printLang != -1) {
- SegManager *segManager = this->segMan;
-
lang = (kLanguage)GET_SEL32V(this->game_obj, printLang);
- if ((segManager->sciVersion() == SCI_VERSION_1_1) || (lang == K_LANG_NONE)) {
+ if ((segMan->sciVersion() == SCI_VERSION_1_1) || (lang == K_LANG_NONE)) {
// If language is set to none, we use the language from the game detector.
// SSCI reads this from resource.cfg (early games do not have a language
// setting in resource.cfg, but instead have the secondary language number
@@ -229,8 +227,6 @@ kLanguage EngineState::getLanguage() {
}
Common::String EngineState::strSplit(const char *str, const char *sep) {
- SegManager *segManager = this->segMan;
-
kLanguage lang = getLanguage();
kLanguage subLang = K_LANG_NONE;
@@ -251,7 +247,7 @@ int EngineState::methodChecksum(reg_t objAddress, Selector sel, int offset, uint
reg_t fptr;
Object *obj = obj_get(segMan, objAddress);
- SelectorType selType = lookup_selector(this->segMan, objAddress, sel, NULL, &fptr);
+ SelectorType selType = lookup_selector(segMan, objAddress, sel, NULL, &fptr);
if (!obj || (selType != kSelectorMethod))
return -1;