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

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Sat Jul 11 09:03:28 CEST 2009


Revision: 42376
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42376&view=rev
Author:   Kirben
Date:     2009-07-11 07:03:28 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
Only error out, if checkStaticSelectorNames() fails.

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-07-11 06:53:39 UTC (rev 42375)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-07-11 07:03:28 UTC (rev 42376)
@@ -388,7 +388,8 @@
 	
 	if (!r) { // No such resource?
 		staticSelectorTable = checkStaticSelectorNames();
-		error("Kernel: Could not retrieve selector names");
+		if (staticSelectorTable.empty())
+			error("Kernel: Could not retrieve selector names");
 	}
 
 	int count = staticSelectorTable.empty() ? READ_LE_UINT16(r->data) + 1 : staticSelectorTable.size(); // Counter is slightly off

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-07-11 06:53:39 UTC (rev 42375)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-07-11 07:03:28 UTC (rev 42376)
@@ -426,4 +426,4 @@
 	
 } // End of namespace Sci
 
-#endif SCI_STATIC_SELECTORS_H
+#endif // SCI_STATIC_SELECTORS_H


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