aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kmovement.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-17 17:00:36 +0000
committerMax Horn2009-09-17 17:00:36 +0000
commit5f440854b7f0f4d9aefda208e9b79c5628adf50f (patch)
treeeccbc04b87ac93c94727572d5caa64d412aa36c8 /engines/sci/engine/kmovement.cpp
parentc2455aad870b87e9603d52b19060f77510bd74a4 (diff)
downloadscummvm-rg350-5f440854b7f0f4d9aefda208e9b79c5628adf50f.tar.gz
scummvm-rg350-5f440854b7f0f4d9aefda208e9b79c5628adf50f.tar.bz2
scummvm-rg350-5f440854b7f0f4d9aefda208e9b79c5628adf50f.zip
SCI: Add EngineState::_kernel member for convenience
svn-id: r44173
Diffstat (limited to 'engines/sci/engine/kmovement.cpp')
-rw-r--r--engines/sci/engine/kmovement.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index b9381b1383..7eb14055b0 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -269,7 +269,7 @@ static void bresenham_autodetect(EngineState *s) {
return;
}
- if (lookup_selector(s->segMan, motion_class, ((SciEngine*)g_engine)->getKernel()->_selectorCache.doit, NULL, &fptr) != kSelectorMethod) {
+ if (lookup_selector(s->segMan, motion_class, s->_kernel->_selectorCache.doit, NULL, &fptr) != kSelectorMethod) {
warning("bresenham_autodetect failed");
handle_movecnt = INCREMENT_MOVECNT; // Most games do this, so best guess
return;
@@ -365,7 +365,7 @@ reg_t kDoBresen(EngineState *s, int, int argc, reg_t *argv) {
debugC(2, kDebugLevelBresen, "New data: (x,y)=(%d,%d), di=%d\n", x, y, bdi);
- if (((SciEngine*)g_engine)->getKernel()->_selectorCache.cantBeHere != -1) {
+ if (s->_kernel->_selectorCache.cantBeHere != -1) {
invoke_selector(INV_SEL(client, cantBeHere, kStopOnInvalidSelector), 0);
s->r_acc = make_reg(0, !s->r_acc.offset);
} else {