[Scummvm-cvs-logs] SF.net SVN: scummvm:[52523] scummvm/trunk/engines/sci/engine/kernel.cpp

[thebluegr at users.sourceforge.net]

Revision: 52523
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52523&view=rev
Author:   thebluegr
Date:     2010-09-04 14:46:29 +0000 (Sat, 04 Sep 2010)

Log Message:
-----------
SCI: Updated comment concerning kCantBeHere and removed a wrong check for Hoyle 3

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-09-04 13:19:49 UTC (rev 52522)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-09-04 14:46:29 UTC (rev 52523)
@@ -744,11 +744,9 @@
 	_kernelNames = Common::StringArray(s_defaultKernelNames, ARRAYSIZE(s_defaultKernelNames));
 
 	// Some (later) SCI versions replaced CanBeHere by CantBeHere
-	if (_selectorCache.cantBeHere != -1) {
-		// hoyle 3 has cantBeHere selector but is assuming to call kCanBeHere
-		if (g_sci->getGameId() != GID_HOYLE3)
-			_kernelNames[0x4d] = "CantBeHere";
-	}
+	// If vocab.999 exists, the kernel function is still named CanBeHere
+	if (_selectorCache.cantBeHere != -1)
+		_kernelNames[0x4d] = "CantBeHere";
 
 	switch (getSciVersion()) {
 	case SCI_VERSION_0_EARLY:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.