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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Dec 22 14:17:20 CET 2010


Revision: 55002
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55002&view=rev
Author:   thebluegr
Date:     2010-12-22 13:17:19 +0000 (Wed, 22 Dec 2010)

Log Message:
-----------
SCI: Changed the check for NULL values inside kArray(Cpy) to only ignore such values in SCI3

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

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2010-12-22 12:15:33 UTC (rev 55001)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2010-12-22 13:17:19 UTC (rev 55002)
@@ -703,9 +703,14 @@
 	}
 	case 6: { // Cpy
 		if (argv[1].isNull() || argv[3].isNull()) {
-			// Happens in SCI3
-			warning("kArray(Cpy): Request to copy from or to a null pointer");
-			return NULL_REG;
+			if (getSciVersion() == SCI_VERSION_3) {
+				// FIXME: Happens in SCI3, probably because of a missing kernel function.
+				warning("kArray(Cpy): Request to copy from or to a null pointer");
+				return NULL_REG;
+			} else {
+				// SCI2-2.1: error out
+				error("kArray(Cpy): Request to copy from or to a null pointer");
+			}
 		}
 
 		reg_t arrayHandle = argv[1];


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