[Scummvm-cvs-logs] scummvm master -> 7105fb23a84f6464149ab031a6eff3ce69bffdff

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7105fb23a8 SCI32: Use correct name of kCantBeHere kernel function


Commit: 7105fb23a84f6464149ab031a6eff3ce69bffdff
    https://github.com/scummvm/scummvm/commit/7105fb23a84f6464149ab031a6eff3ce69bffdff
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-10T18:31:10-06:00

Commit Message:
SCI32: Use correct name of kCantBeHere kernel function

Only updating SCI32 names here due to not knowing about the
correctness of the SCI16 code.

Changed paths:
    engines/sci/engine/kgraphics.cpp
    engines/sci/graphics/compare.cpp
    engines/sci/graphics/compare.h



diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index f18d264..cae5a09 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 04cf859..8b2d5e2 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 94aacbf..c700598 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);