diff options
author | Filippos Karapetis | 2009-09-23 10:55:35 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-09-23 10:55:35 +0000 |
commit | 13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a (patch) | |
tree | f0e1021c9235d3ad9c03a4a02688f9ba9111bc99 /engines/sci/engine/static_selectors.cpp | |
parent | 63208a20fdc466bb6ec88dc09c7f2901ef144794 (diff) | |
download | scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.tar.gz scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.tar.bz2 scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.zip |
- Moved the SCI version in a global variable
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)
The fallback detector should work correctly now
svn-id: r44269
Diffstat (limited to 'engines/sci/engine/static_selectors.cpp')
-rw-r--r-- | engines/sci/engine/static_selectors.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp index 76e0110249..4c68f44831 100644 --- a/engines/sci/engine/static_selectors.cpp +++ b/engines/sci/engine/static_selectors.cpp @@ -89,9 +89,9 @@ static const SelectorRemap sci11SelectorRemap[] = { { "syncTime", 279 }, { "syncCue", 280 }, { 0, 0 } }; -Common::StringList Kernel::checkStaticSelectorNames(SciVersion version) { +Common::StringList Kernel::checkStaticSelectorNames() { Common::StringList names; - const int offset = (version < SCI_VERSION_1_1) ? 3 : 0; + const int offset = (getSciVersion() < SCI_VERSION_1_1) ? 3 : 0; const int count = ARRAYSIZE(sci0Selectors) + offset; const SelectorRemap *selectorRemap = sci0SelectorRemap; int i; @@ -103,7 +103,7 @@ Common::StringList Kernel::checkStaticSelectorNames(SciVersion version) { for (i = offset; i < count; i++) names[i] = sci0Selectors[i - offset]; - if (version <= SCI_VERSION_01) { + if (getSciVersion() <= SCI_VERSION_01) { selectorRemap = sci0SelectorRemap; } else { // Several new selectors were added in SCI 1 and later. @@ -112,7 +112,7 @@ Common::StringList Kernel::checkStaticSelectorNames(SciVersion version) { for (i = count; i < count + count2; i++) names[i] = sci1Selectors[i - count]; - if (version < SCI_VERSION_1_1) { + if (getSciVersion() < SCI_VERSION_1_1) { selectorRemap = sci1SelectorRemap; } else { selectorRemap = sci11SelectorRemap; |