From c76422412dbecb6ed898d7f93d00c78bf5bb3d93 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sat, 27 Nov 2010 18:46:12 +0000 Subject: SCI: Compensate for buggy KQ5CD saved games (before r54510) svn-id: r54513 --- engines/sci/sci.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 35fdbe4ea7..43422b4ede 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -435,6 +435,8 @@ void SciEngine::patchGameSaveRestore(SegManager *segMan) { 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(); -- cgit v1.2.3