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

[m_kiewitz at users.sourceforge.net]

Revision: 50806
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50806&view=rev
Author:   m_kiewitz
Date:     2010-07-11 19:16:16 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
SCI: kUnLoad - removing unneeded warnings (signature mismatch will happen now), added information about parameters

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-07-11 19:11:48 UTC (rev 50805)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-07-11 19:16:16 UTC (rev 50806)
@@ -49,6 +49,8 @@
 }
 
 // Unloads an arbitrary resource of type 'restype' with resource numbber 'resnr'
+//  behaviour of this call didn't change between sci0->sci1.1 parameter wise, which means getting called with
+//  1 or 3+ parameters is not right according to sierra sci
 reg_t kUnLoad(EngineState *s, int argc, reg_t *argv) {
 	if (argc >= 2) {
 		ResourceType restype = (ResourceType)(argv[0].toUint16() & 0x7f);
@@ -64,11 +66,6 @@
 
 		if (restype == kResourceTypeMemory)
 			s->_segMan->freeHunkEntry(resnr);
-
-		if (argc > 2)
-			warning("kUnload called with more than 2 parameters (%d)", argc);
-	} else {
-		warning("kUnload called with less than 2 parameters (%d) - ignoring", argc);
 	}
 
 	return s->r_acc;


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