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

[thebluegr at users.sourceforge.net]

Revision: 54216
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54216&view=rev
Author:   thebluegr
Date:     2010-11-12 00:01:13 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
SCI: Don't check for SCI2/SCI2.1 kernel types in SCI3 games. 

Patch by lskovlun

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-11-11 23:51:43 UTC (rev 54215)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-11-12 00:01:13 UTC (rev 54216)
@@ -836,7 +836,7 @@
 	// version (2.100.002), yet they would not be compatible with other
 	// games of the same interpreter.
 
-	if (features->detectSci21KernelType() == SCI_VERSION_2) {
+	if (getSciVersion() != SCI_VERSION_3 && features->detectSci21KernelType() == SCI_VERSION_2) {
 		_kernelNames = Common::StringArray(sci2_default_knames, kKernelEntriesGk2Demo);
 		// OnMe is IsOnMe here, but they should be compatible
 		_kernelNames[0x23] = "Robot"; // Graph in SCI2


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