aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/selector.cpp
diff options
context:
space:
mode:
authorMax Horn2010-02-13 17:45:40 +0000
committerMax Horn2010-02-13 17:45:40 +0000
commite45f0f309acd2448dc042bd89584791f932388a3 (patch)
tree89440faa87e843d4460cd3a1221915e18dffbdb1 /engines/sci/engine/selector.cpp
parent9575cc08a2d54af57ada390f0f736d64857a49d1 (diff)
downloadscummvm-rg350-e45f0f309acd2448dc042bd89584791f932388a3.tar.gz
scummvm-rg350-e45f0f309acd2448dc042bd89584791f932388a3.tar.bz2
scummvm-rg350-e45f0f309acd2448dc042bd89584791f932388a3.zip
SCI: Remove EngineState::_kernel, use SciEngine::_kernel instead
svn-id: r48050
Diffstat (limited to 'engines/sci/engine/selector.cpp')
-rw-r--r--engines/sci/engine/selector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/selector.cpp b/engines/sci/engine/selector.cpp
index 8a859b1431..20a10a180e 100644
--- a/engines/sci/engine/selector.cpp
+++ b/engines/sci/engine/selector.cpp
@@ -215,14 +215,14 @@ int invoke_selector_argv(EngineState *s, reg_t object, int selector_id, Selector
if (slc_type == kSelectorNone) {
warning("Selector '%s' of object at %04x:%04x could not be invoked",
- s->_kernel->getSelectorName(selector_id).c_str(), PRINT_REG(object));
+ g_sci->getKernel()->getSelectorName(selector_id).c_str(), PRINT_REG(object));
if (noinvalid == kStopOnInvalidSelector)
error("[Kernel] Not recoverable: VM was halted");
return 1;
}
if (slc_type == kSelectorVariable) {
warning("Attempting to invoke variable selector %s of object %04x:%04x",
- s->_kernel->getSelectorName(selector_id).c_str(), PRINT_REG(object));
+ g_sci->getKernel()->getSelectorName(selector_id).c_str(), PRINT_REG(object));
return 0;
}