thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Moved the SCI version in a global variable

Browse source 
- 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
This commit is contained in:
Filippos Karapetis 2009-09-23 10:55:35 +00:00
parent 63208a20fd
commit 13ad217cdd
25 changed files with 149 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/sci/engine/static_selectors.cpp
View file

@ -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;