diff options
| author | Travis Howell | 2009-07-11 07:03:28 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-07-11 07:03:28 +0000 |
| commit | 9594beb39fa6eb6c9bad7572989f0eb50fc3bc32 (patch) | |
| tree | ad283ba25910a8aa0b53c6e69ebd81127d915b94 /engines/sci | |
| parent | 2b5fac58d5323847042e53f114ad94ce2d526f3b (diff) | |
| download | scummvm-rg350-9594beb39fa6eb6c9bad7572989f0eb50fc3bc32.tar.gz scummvm-rg350-9594beb39fa6eb6c9bad7572989f0eb50fc3bc32.tar.bz2 scummvm-rg350-9594beb39fa6eb6c9bad7572989f0eb50fc3bc32.zip | |
Only error out, if checkStaticSelectorNames() fails.
svn-id: r42376
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/engine/static_selectors.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
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 |