From 9594beb39fa6eb6c9bad7572989f0eb50fc3bc32 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 11 Jul 2009 07:03:28 +0000
Subject: Only error out, if checkStaticSelectorNames() fails.

svn-id: r42376
---
 engines/sci/engine/kernel.cpp           | 3 ++-
 engines/sci/engine/static_selectors.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 83a2ee4dec..4133f4cb3b 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -388,7 +388,8 @@ void Kernel::detectSciFeatures() {
 	
 	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
diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp
index 497a0ad769..c1d0ad9bac 100644
--- a/engines/sci/engine/static_selectors.cpp
+++ b/engines/sci/engine/static_selectors.cpp
@@ -426,4 +426,4 @@ Common::StringList Kernel::checkStaticSelectorNames() {
 	
 } // End of namespace Sci
 
-#endif SCI_STATIC_SELECTORS_H
+#endif // SCI_STATIC_SELECTORS_H
-- 
cgit v1.2.3