diff options
Diffstat (limited to 'engines/sci/console.cpp')
| -rw-r--r-- | engines/sci/console.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 3d6d35a5fc..a7dd995ff9 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -360,8 +360,8 @@ ResourceType parseResourceType(const char *resid) { } const char *selector_name(EngineState *s, int selector) { - if (selector >= 0 && selector < (int)((SciEngine*)g_engine)->getKernel()->getSelectorNamesSize()) - return ((SciEngine*)g_engine)->getKernel()->getSelectorName(selector).c_str(); + if (selector >= 0 && selector < (int)s->_kernel->getSelectorNamesSize()) + return s->_kernel->getSelectorName(selector).c_str(); else return "--INVALID--"; } @@ -3132,7 +3132,7 @@ static void viewobjinfo(EngineState *s, HeapPtr pos) { int have_rects = 0; Common::Rect nsrect, nsrect_clipped, brrect; - if (lookup_selector(s->segMan, pos, ((SciEngine*)g_engine)->getKernel()->_selectorCache.nsBottom, NULL) == kSelectorVariable) { + if (lookup_selector(s->segMan, pos, s->_kernel->_selectorCache.nsBottom, NULL) == kSelectorVariable) { GETRECT(nsLeft, nsRight, nsBottom, nsTop); GETRECT(lsLeft, lsRight, lsBottom, lsTop); GETRECT(brLeft, brRight, brBottom, brTop); @@ -3146,7 +3146,7 @@ static void viewobjinfo(EngineState *s, HeapPtr pos) { x = GET_SELECTOR(pos, x); y = GET_SELECTOR(pos, y); priority = GET_SELECTOR(pos, priority); - if (((SciEngine*)g_engine)->getKernel()->_selectorCache.z > 0) { + if (s->_kernel->_selectorCache.z > 0) { z = GET_SELECTOR(pos, z); printf("(%d,%d,%d)\n", x, y, z); } else @@ -3210,10 +3210,10 @@ static int c_gfx_draw_viewobj(EngineState *s, const Common::Array<cmd_param_t> & } - is_view = (lookup_selector(s->segMan, pos, ((SciEngine*)g_engine)->getKernel()->_selectorCache.x, NULL) == kSelectorVariable) && - (lookup_selector(s->segMan, pos, ((SciEngine*)g_engine)->getKernel()->_selectorCache.brLeft, NULL) == kSelectorVariable) && - (lookup_selector(s->segMan, pos, ((SciEngine*)g_engine)->getKernel()->_selectorCache.signal, NULL) == kSelectorVariable) && - (lookup_selector(s->segMan, pos, ((SciEngine*)g_engine)->getKernel()->_selectorCache.nsTop, NULL) == kSelectorVariable); + is_view = (lookup_selector(s->segMan, pos, s->_kernel->_selectorCache.x, NULL) == kSelectorVariable) && + (lookup_selector(s->segMan, pos, s->_kernel->_selectorCache.brLeft, NULL) == kSelectorVariable) && + (lookup_selector(s->segMan, pos, s->_kernel->_selectorCache.signal, NULL) == kSelectorVariable) && + (lookup_selector(s->segMan, pos, s->_kernel->_selectorCache.nsTop, NULL) == kSelectorVariable); if (!is_view) { printf("Not a dynamic View object.\n"); |