diff options
| author | Filippos Karapetis | 2010-06-23 15:08:23 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-23 15:08:23 +0000 |
| commit | db6c7a3deee4f9e312c8dcead3e7e32baddf4166 (patch) | |
| tree | 3e6091c5f6e6e1554f9822d0a49db3b2a266ec40 | |
| parent | c1d3fd670c34b751c5e7a4236c14cb72ca973548 (diff) | |
| download | scummvm-rg350-db6c7a3deee4f9e312c8dcead3e7e32baddf4166.tar.gz scummvm-rg350-db6c7a3deee4f9e312c8dcead3e7e32baddf4166.tar.bz2 scummvm-rg350-db6c7a3deee4f9e312c8dcead3e7e32baddf4166.zip | |
Removed a hack with SCI1.1 static selectors, and set them properly. This fixes scaling in the demo of QFG3
svn-id: r50182
| -rw-r--r-- | engines/sci/engine/static_selectors.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp index 6f44788fd7..fcef04f6ad 100644 --- a/engines/sci/engine/static_selectors.cpp +++ b/engines/sci/engine/static_selectors.cpp @@ -100,10 +100,18 @@ static const SelectorRemap sciSelectorRemap[] = { { SCI_VERSION_0_EARLY, SCI_VERSION_0_LATE, "moveDone", 170 }, { SCI_VERSION_0_EARLY, SCI_VERSION_0_LATE, "points", 316 }, { SCI_VERSION_0_EARLY, SCI_VERSION_0_LATE, "flags", 368 }, - { SCI_VERSION_1_EARLY, SCI_VERSION_1_1, "nodePtr", 44 }, - { SCI_VERSION_1_LATE, SCI_VERSION_1_1, "cantBeHere", 57 }, - { SCI_VERSION_1_EARLY, SCI_VERSION_1_1, "topString", 101 }, - { SCI_VERSION_1_EARLY, SCI_VERSION_1_1, "flags", 102 }, + { SCI_VERSION_1_EARLY, SCI_VERSION_1_LATE, "nodePtr", 44 }, + { SCI_VERSION_1_LATE, SCI_VERSION_1_LATE, "cantBeHere", 57 }, + { SCI_VERSION_1_EARLY, SCI_VERSION_1_LATE, "topString", 101 }, + { SCI_VERSION_1_EARLY, SCI_VERSION_1_LATE, "flags", 102 }, + // SCI1.1 + { SCI_VERSION_1_1, SCI_VERSION_1_1, "nodePtr", 41 }, + { SCI_VERSION_1_1, SCI_VERSION_1_1, "cantBeHere", 54 }, + { SCI_VERSION_1_1, SCI_VERSION_1_1, "topString", 98 }, + { SCI_VERSION_1_1, SCI_VERSION_1_1, "flags", 99 }, + // quitGame + // restart + // hide { SCI_VERSION_1_1, SCI_VERSION_1_1,"scaleSignal", 103 }, { SCI_VERSION_1_1, SCI_VERSION_1_1, "scaleX", 104 }, { SCI_VERSION_1_1, SCI_VERSION_1_1, "scaleY", 105 }, @@ -146,9 +154,6 @@ Common::StringArray Kernel::checkStaticSelectorNames() { if (selectorRemap->slot >= names.size()) names.resize(selectorRemap->slot + 1); if (getSciVersion() >= selectorRemap->minVersion && getSciVersion() <= selectorRemap->maxVersion) { - // The SCI1 selectors we use exist in SCI1.1 too, offset by 3 - if (selectorRemap->minVersion >= SCI_VERSION_1_EARLY && getSciVersion() == SCI_VERSION_1_1) - slot -= 3; names[slot] = selectorRemap->name; } } |