diff options
| author | Colin Snover | 2016-09-26 19:28:51 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-09-29 19:39:16 -0500 |
| commit | 6290f1e5fcc241441230912c4762828500988dab (patch) | |
| tree | 0c763293504b076fc1ffdc1ae83043449facc00e /engines/sci/graphics/animate.cpp | |
| parent | 8cb994b80125fbb02a1c2d35781e96e194a56ed1 (diff) | |
| download | scummvm-rg350-6290f1e5fcc241441230912c4762828500988dab.tar.gz scummvm-rg350-6290f1e5fcc241441230912c4762828500988dab.tar.bz2 scummvm-rg350-6290f1e5fcc241441230912c4762828500988dab.zip | |
SCI: Add prefix to global variable constants
Diffstat (limited to 'engines/sci/graphics/animate.cpp')
| -rw-r--r-- | engines/sci/graphics/animate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp index e593484d8b..8d92cb905f 100644 --- a/engines/sci/graphics/animate.cpp +++ b/engines/sci/graphics/animate.cpp @@ -145,7 +145,7 @@ bool GfxAnimate::invoke(List *list, int argc, reg_t *argv) { if (_fastCastEnabled) { // Check if the game has a fastCast object set // if we don't abort kAnimate processing, at least in kq5 there will be animation cels drawn into speech boxes. - if (!_s->variables[VAR_GLOBAL][kFastCast].isNull()) { + if (!_s->variables[VAR_GLOBAL][kGlobalVarFastCast].isNull()) { // This normally points to an object called "fastCast", // but for example in Eco Quest 1 it may also point to an object called "EventHandler" (see bug #5170) // Original SCI only checked, if this global was not 0. @@ -338,7 +338,7 @@ void GfxAnimate::applyGlobalScaling(AnimateList::iterator entry, GfxView *view) int16 maxScale = readSelectorValue(_s->_segMan, entry->object, SELECTOR(maxScale)); int16 celHeight = view->getHeight(entry->loopNo, entry->celNo); int16 maxCelHeight = (maxScale * celHeight) >> 7; - reg_t globalVar2 = _s->variables[VAR_GLOBAL][kCurrentRoom]; // current room object + reg_t globalVar2 = _s->variables[VAR_GLOBAL][kGlobalVarCurrentRoom]; // current room object int16 vanishingY = readSelectorValue(_s->_segMan, globalVar2, SELECTOR(vanishingY)); int16 fixedPortY = _ports->getPort()->rect.bottom - vanishingY; |