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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Jun 1 09:06:05 CEST 2009


Revision: 41094
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41094&view=rev
Author:   thebluegr
Date:     2009-06-01 07:06:04 +0000 (Mon, 01 Jun 2009)

Log Message:
-----------
Removed the sci_max_allowed_unknown_kernel_functions array

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-06-01 03:27:54 UTC (rev 41093)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-06-01 07:06:04 UTC (rev 41094)
@@ -311,20 +311,6 @@
 	const char *signature;  /* kfunct signature */
 };
 
-static const int sci_max_allowed_unknown_kernel_functions[] = {
-	0,
-	0x72, // SCI0
-	0x7b, // SCI01/EGA
-	0x7b, // SCI01/VGA
-	0x7b, // SCI01/VGA ODD
-	0x7b, // SCI1/EARLY
-	0x7b, // SCI1/LATE
-	0x7b, // SCI1.1
-#ifdef ENABLE_SCI32
-	0x0, // SCI32
-#endif
-};
-
 #define DEFUN(nm, cname, sig) {KF_NEW, nm, cname, sig}
 #define NOFUN(nm) {KF_NONE, nm, NULL, NULL}
 
@@ -603,7 +589,7 @@
 	int mapped = 0;
 	int ignored = 0;
 	uint functions_nr = s->_vocabulary->getKernelNamesSize();
-	uint max_functions_nr = sci_max_allowed_unknown_kernel_functions[s->resmgr->_sciVersion];
+	uint max_functions_nr = (s->resmgr->_sciVersion == SCI_VERSION_0) ? 0x72 : 0x7b;
 
 	if (functions_nr < max_functions_nr) {
 		warning("SCI version believed to have %d kernel"


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