aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/state.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-17 13:21:42 +0000
committerMax Horn2009-09-17 13:21:42 +0000
commit364640cfd58a99a7b61f914a836c156d55a25c3c (patch)
tree3d49179cb5e6731cd52b2b279c781a718012e788 /engines/sci/engine/state.cpp
parentb2c386ed000bce9a34a3d392b57a5d9abe8dfa7e (diff)
downloadscummvm-rg350-364640cfd58a99a7b61f914a836c156d55a25c3c.tar.gz
scummvm-rg350-364640cfd58a99a7b61f914a836c156d55a25c3c.tar.bz2
scummvm-rg350-364640cfd58a99a7b61f914a836c156d55a25c3c.zip
SCI: Rename selector_map_t -> SelectorCache and _selectorMap -> _selectorCache
svn-id: r44152
Diffstat (limited to 'engines/sci/engine/state.cpp')
-rw-r--r--engines/sci/engine/state.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index bf385d6551..aedbd92319 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -180,7 +180,7 @@ Common::String EngineState::getLanguageString(const char *str, kLanguage lang) c
kLanguage EngineState::getLanguage() {
kLanguage lang = K_LANG_ENGLISH;
- if (((SciEngine*)g_engine)->getKernel()->_selectorMap.printLang != -1) {
+ if (((SciEngine*)g_engine)->getKernel()->_selectorCache.printLang != -1) {
lang = (kLanguage)GET_SEL32V(this->game_obj, printLang);
if ((segMan->sciVersion() == SCI_VERSION_1_1) || (lang == K_LANG_NONE)) {
@@ -227,7 +227,7 @@ Common::String EngineState::strSplit(const char *str, const char *sep) {
kLanguage lang = getLanguage();
kLanguage subLang = K_LANG_NONE;
- if (((SciEngine*)g_engine)->getKernel()->_selectorMap.subtitleLang != -1)
+ if (((SciEngine*)g_engine)->getKernel()->_selectorCache.subtitleLang != -1)
subLang = (kLanguage)GET_SEL32V(this->game_obj, subtitleLang);
Common::String retval = getLanguageString(str, lang);
@@ -273,7 +273,7 @@ SciVersion EngineState::detectDoSoundType() {
reg_t soundClass;
if (!parse_reg_t(this, "?Sound", &soundClass)) {
- int sum = methodChecksum(soundClass, ((SciEngine *)g_engine)->getKernel()->_selectorMap.play, -6, 6);
+ int sum = methodChecksum(soundClass, ((SciEngine *)g_engine)->getKernel()->_selectorCache.play, -6, 6);
switch(sum) {
case 0x1B2: // SCI0
@@ -310,7 +310,7 @@ SciVersion EngineState::detectDoSoundType() {
SciVersion EngineState::detectSetCursorType() {
if (_setCursorType == SCI_VERSION_AUTODETECT) {
- int sum = methodChecksum(game_obj, ((SciEngine *)g_engine)->getKernel()->_selectorMap.setCursor, 0, 21);
+ int sum = methodChecksum(game_obj, ((SciEngine *)g_engine)->getKernel()->_selectorCache.setCursor, 0, 21);
if ((sum == 0x4D5) || (sum == 0x552)) {
// Standard setCursor