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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Jan 6 15:04:57 CET 2010


Revision: 47079
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47079&view=rev
Author:   thebluegr
Date:     2010-01-06 14:04:56 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
The error inside execute_method() has been restored, it's only a warning for SCI2+ games for now, till we figure out what's wrong

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-06 13:26:53 UTC (rev 47078)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-06 14:04:56 UTC (rev 47079)
@@ -226,7 +226,14 @@
 
 	const int temp = s->_segMan->validateExportFunc(pubfunct, seg);
 	if (!temp) {
-		warning("Request for invalid exported function 0x%x of script 0x%x", pubfunct, script);
+#ifdef ENABLE_SCI32
+		// HACK: Temporarily switch to a warning in SCI32 games until we can figure out why Torin has
+		// an invalid exported function.
+		if (getSciVersion() >= SCI_VERSION_2)
+			warning("Request for invalid exported function 0x%x of script 0x%x", pubfunct, script);
+		else
+#endif
+			error("Request for invalid exported function 0x%x of script 0x%x", pubfunct, script);
 		return NULL;
 	}
 


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