aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kmovement.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-06-01 14:12:43 +0000
committerFilippos Karapetis2009-06-01 14:12:43 +0000
commit99c687463030254c5489cd3d47d876970ab7c080 (patch)
tree3491eba1a935eaea0a653fd173d5fad60fd72d1d /engines/sci/engine/kmovement.cpp
parent660aa716625866ae3a9db2a001ed3af6e108caaf (diff)
downloadscummvm-rg350-99c687463030254c5489cd3d47d876970ab7c080.tar.gz
scummvm-rg350-99c687463030254c5489cd3d47d876970ab7c080.tar.bz2
scummvm-rg350-99c687463030254c5489cd3d47d876970ab7c080.zip
Split the kernel functions away from the vocabulary functions (WIP, saving/loading is broken)
svn-id: r41101
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 402f040304..4f7d770d0f 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -462,7 +462,7 @@ static void bresenham_autodetect(EngineState *s) {
return;
}
- if (lookup_selector(s, motion_class, s->_vocabulary->_selectorMap.doit, NULL, &fptr) != kSelectorMethod) {
+ if (lookup_selector(s, motion_class, s->_kernel->_selectorMap.doit, NULL, &fptr) != kSelectorMethod) {
warning("bresenham_autodetect failed");
handle_movecnt = INCREMENT_MOVECNT; // Most games do this, so best guess
return;
@@ -557,7 +557,7 @@ reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
debugC(2, kDebugLevelBresen, "New data: (x,y)=(%d,%d), di=%d\n", x, y, bdi);
- if (s->_vocabulary->_selectorMap.cantBeHere != -1)
+ if (s->_kernel->_selectorMap.cantBeHere != -1)
invoke_selector(INV_SEL(client, cantBeHere, kStopOnInvalidSelector), 0);
else
invoke_selector(INV_SEL(client, canBeHere, kStopOnInvalidSelector), 0);