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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Fri Jun 18 04:23:31 CEST 2010


Revision: 49995
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49995&view=rev
Author:   thebluegr
Date:     2010-06-18 02:23:30 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
Changed another warning into an error. Cleanup

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

Modified: scummvm/trunk/engines/sci/engine/kscripts.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-06-18 02:16:00 UTC (rev 49994)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-06-18 02:23:30 UTC (rev 49995)
@@ -66,6 +66,7 @@
 			if (id.getType() == kResourceTypeInvalid)
 				warning("[resMan] Attempt to unlock resource %i of invalid type %i", id.getNumber(), type);
 			else
+				// Happens in CD games (e.g. LSL6CD) with the message resource
 				warning("[resMan] Attempt to unlock non-existant resource %s", id.toString().c_str());
 		}
 		break;
@@ -163,7 +164,6 @@
 	}
 
 	if (!victim_obj->isClone()) {
-		//warning("Attempt to dispose something other than a clone at %04x", offset);
 		// SCI silently ignores this behaviour; some games actually depend on it
 		return s->r_acc;
 	}
@@ -193,9 +193,10 @@
 		// and this call is probably used to load them in memory, ignoring
 		// the return value. If only one argument is passed, this call is done
 		// only to load the script in memory. Thus, don't show any warning,
-		// as no return value is expected
+		// as no return value is expected. If an export is requested, then
+		// it will most certainly fail with OOB access.
 		if (argc == 2)
-			warning("Script 0x%x does not have a dispatch table and export %d "
+			error("Script 0x%x does not have a dispatch table and export %d "
 					"was requested from it", script, index);
 		return NULL_REG;
 	}


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