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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Wed Aug 11 08:13:09 CEST 2010


Revision: 51970
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51970&view=rev
Author:   m_kiewitz
Date:     2010-08-11 06:13:08 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
SCI: making camelot fix camelot-only for now

fixes kq6 getting assert as well (bug 3042866)

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

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-08-11 05:20:29 UTC (rev 51969)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-08-11 06:13:08 UTC (rev 51970)
@@ -332,8 +332,10 @@
 	if (offset == 0) {
 		// Check if the game has a second export table (e.g. script 912 in Camelot)
 		// Fixes bug #3039785
-		if (g_sci->getGameId() == GID_ECOQUEST) // cheap fix in here for eco quest 1, [md5] plz look into this TODO FIXME
+		if (g_sci->getGameId() != GID_CAMELOT) // cheap fix
 			return offset;
+		// we are getting assert()s in eco quest 1 (right on startup) and kq6 and maybe more
+		// [md5] plz look into this TODO FIXME
 		const uint16 *secondExportTable = (const uint16 *)findBlock(SCI_OBJ_EXPORTS, 0);
 
 		if (secondExportTable) {


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