thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Add EngineState::_kernel member for convenience

Browse source 
svn-id: r44173
This commit is contained in:
Max Horn 2009-09-17 17:00:36 +00:00
parent c2455aad87
commit 5f440854b7
13 changed files with 47 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/sci/console.cpp
View file

@ -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");