[Scummvm-cvs-logs] SF.net SVN: scummvm:[54402] scummvm/trunk/engines/sci

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Nov 21 03:06:21 CET 2010


Revision: 54402
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54402&view=rev
Author:   thebluegr
Date:     2010-11-21 02:06:20 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
SCI: kArray wasn't changed in late SCI2.1/SCI3 games (thanks to waltervn)

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

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-11-21 00:58:06 UTC (rev 54401)
+++ scummvm/trunk/engines/sci/console.cpp	2010-11-21 02:06:20 UTC (rev 54402)
@@ -453,7 +453,7 @@
 	DebugPrintf("Move count type: %s\n", (_engine->_features->handleMoveCount()) ? "increment" : "ignore");
 	DebugPrintf("SetCursor type: %s\n", getSciVersionDesc(_engine->_features->detectSetCursorType()));
 #ifdef ENABLE_SCI32
-	DebugPrintf("kString/kArray type: %s\n", (_engine->_features->detectSci2StringFunctionType() == kSci2StringFunctionOld) ? "SCI2 (old)" : "SCI2.1 (new)");
+	DebugPrintf("kString type: %s\n", (_engine->_features->detectSci2StringFunctionType() == kSci2StringFunctionOld) ? "SCI2 (old)" : "SCI2.1 (new)");
 #endif
 	DebugPrintf("View type: %s\n", viewTypeDesc[g_sci->getResMan()->getViewType()]);
 	DebugPrintf("Uses palette merging: %s\n", g_sci->_gfxPalette->isMerging() ? "yes" : "no");

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2010-11-21 00:58:06 UTC (rev 54401)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2010-11-21 02:06:20 UTC (rev 54402)
@@ -641,11 +641,6 @@
 		}
 	}
 
-	if (g_sci->_features->detectSci2StringFunctionType() == kSci2StringFunctionNew) {
-		if (op >= 6)	// Cpy, Cmp have been removed
-			op += 2;
-	}
-
 	switch (op) {
 	case 0: { // New
 		reg_t arrayHandle;
@@ -776,13 +771,6 @@
 			return argv[1];
 
 		return readSelector(s->_segMan, argv[1], SELECTOR(data));
-	// New subops in SCI2.1 late / SCI3
-	case 10:	// unknown
-		warning("kArray, subop %d", op);
-		return NULL_REG;
-	case 11:	// unknown
-		warning("kArray, subop %d", op);
-		return NULL_REG;
 	default:
 		error("Unknown kArray subop %d", op);
 	}


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




More information about the Scummvm-git-logs mailing list