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

[thebluegr at users.sourceforge.net]

Revision: 54513
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54513&view=rev
Author:   thebluegr
Date:     2010-11-27 18:46:12 +0000 (Sat, 27 Nov 2010)

Log Message:
-----------
SCI: Compensate for buggy KQ5CD saved games (before r54510)

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

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-11-27 18:27:02 UTC (rev 54512)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-11-27 18:46:12 UTC (rev 54513)
@@ -435,6 +435,8 @@
 	const Object *gameObject = segMan->getObject(_gameObjectAddress);
 	const uint16 gameMethodCount = gameObject->getMethodCount();
 	const Object *gameSuperObject = segMan->getObject(_gameSuperClassAddress);
+	if (!gameSuperObject)
+		gameSuperObject = gameObject;	// happens in KQ5CD, when loading saved games before r54510
 	const uint16 gameSuperMethodCount = gameSuperObject->getMethodCount();
 	reg_t methodAddress;
 	const uint16 kernelCount = _kernel->getKernelNamesSize();


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