diff options
| author | Filippos Karapetis | 2009-07-11 23:45:54 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-07-11 23:45:54 +0000 |
| commit | 31a0c8090513023596351174aa48f787ca6384b3 (patch) | |
| tree | 56a0bf0b62d543f533fe86e479a7edb080ea548d /engines/sci/engine/kmovement.cpp | |
| parent | 116d2254119476f58b6b135b7a06a207f38fb5d0 (diff) | |
| download | scummvm-rg350-31a0c8090513023596351174aa48f787ca6384b3.tar.gz scummvm-rg350-31a0c8090513023596351174aa48f787ca6384b3.tar.bz2 scummvm-rg350-31a0c8090513023596351174aa48f787ca6384b3.zip | |
Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game)
svn-id: r42398
Diffstat (limited to 'engines/sci/engine/kmovement.cpp')
| -rw-r--r-- | engines/sci/engine/kmovement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp index 90db630bfa..8774224f60 100644 --- a/engines/sci/engine/kmovement.cpp +++ b/engines/sci/engine/kmovement.cpp @@ -267,7 +267,7 @@ static void bresenham_autodetect(EngineState *s) { return; } - if (lookup_selector(s, motion_class, s->_kernel->_selectorMap.doit, NULL, &fptr) != kSelectorMethod) { + if (lookup_selector(s, motion_class, ((SciEngine*)g_engine)->getKernel()->_selectorMap.doit, NULL, &fptr) != kSelectorMethod) { warning("bresenham_autodetect failed"); handle_movecnt = INCREMENT_MOVECNT; // Most games do this, so best guess return; @@ -362,7 +362,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->_kernel->_selectorMap.cantBeHere != -1) + if (((SciEngine*)g_engine)->getKernel()->_selectorMap.cantBeHere != -1) invoke_selector(INV_SEL(client, cantBeHere, kStopOnInvalidSelector), 0); else invoke_selector(INV_SEL(client, canBeHere, kStopOnInvalidSelector), 0); |