diff options
| author | Colin Snover | 2016-03-10 18:31:10 -0600 |
|---|---|---|
| committer | Colin Snover | 2016-03-10 18:31:10 -0600 |
| commit | 7105fb23a84f6464149ab031a6eff3ce69bffdff (patch) | |
| tree | 4ceaf4b424be53b7ed89029f13188a28cbc9b781 | |
| parent | 41b3d9ff46dacb4cd1d7edff57f719af9b35113c (diff) | |
| download | scummvm-rg350-7105fb23a84f6464149ab031a6eff3ce69bffdff.tar.gz scummvm-rg350-7105fb23a84f6464149ab031a6eff3ce69bffdff.tar.bz2 scummvm-rg350-7105fb23a84f6464149ab031a6eff3ce69bffdff.zip | |
SCI32: Use correct name of kCantBeHere kernel function
Only updating SCI32 names here due to not knowing about the
correctness of the SCI16 code.
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/compare.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/graphics/compare.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index f18d2643bc..cae5a09789 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -443,7 +443,7 @@ reg_t kCantBeHere(EngineState *s, int argc, reg_t *argv) { #ifdef ENABLE_SCI32 if (getSciVersion() >= SCI_VERSION_2) { - return g_sci->_gfxCompare->kernelCanBeHere32(curObject, listReference); + return g_sci->_gfxCompare->kernelCantBeHere32(curObject, listReference); } else { #endif return g_sci->_gfxCompare->kernelCanBeHere(curObject, listReference); diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp index 04cf85966d..8b2d5e247a 100644 --- a/engines/sci/graphics/compare.cpp +++ b/engines/sci/graphics/compare.cpp @@ -157,7 +157,7 @@ reg_t GfxCompare::kernelCanBeHere(reg_t curObject, reg_t listReference) { return make_reg(0, result); } -reg_t GfxCompare::kernelCanBeHere32(const reg_t curObject, const reg_t listReference) const { +reg_t GfxCompare::kernelCantBeHere32(const reg_t curObject, const reg_t listReference) const { Common::Rect checkRect( readSelectorValue(_segMan, curObject, SELECTOR(brLeft)), readSelectorValue(_segMan, curObject, SELECTOR(brTop)), @@ -172,7 +172,7 @@ reg_t GfxCompare::kernelCanBeHere32(const reg_t curObject, const reg_t listRefer if ((signal & signalFlags) == 0) { List *list = _segMan->lookupList(listReference); if (!list) { - error("kCanBeHere called with non-list as parameter"); + error("kCantBeHere called with non-list as parameter"); } result = !canBeHereCheckRectList(curObject, checkRect, list, signalFlags).isNull(); } diff --git a/engines/sci/graphics/compare.h b/engines/sci/graphics/compare.h index 94aacbfed1..c7005980d0 100644 --- a/engines/sci/graphics/compare.h +++ b/engines/sci/graphics/compare.h @@ -40,7 +40,7 @@ public: uint16 kernelOnControl(byte screenMask, const Common::Rect &rect); void kernelSetNowSeen(reg_t objectReference); reg_t kernelCanBeHere(reg_t curObject, reg_t listReference); - reg_t kernelCanBeHere32(const reg_t curObject, const reg_t listReference) const; + reg_t kernelCantBeHere32(const reg_t curObject, const reg_t listReference) const; bool kernelIsItSkip(GuiResourceId viewId, int16 loopNo, int16 celNo, Common::Point position); void kernelBaseSetter(reg_t object); Common::Rect getNSRect(reg_t object); |