diff options
author | Filippos Karapetis | 2009-11-20 15:31:08 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-11-20 15:31:08 +0000 |
commit | 22c09f521aa5d4a220d53a8f8b3b277623b128a6 (patch) | |
tree | 1aea2af3959cbe43d1803a530ee6b72fe447a61c | |
parent | 1ea30ca176441a2a440901cce4c99ffa5493b977 (diff) | |
download | scummvm-rg350-22c09f521aa5d4a220d53a8f8b3b277623b128a6.tar.gz scummvm-rg350-22c09f521aa5d4a220d53a8f8b3b277623b128a6.tar.bz2 scummvm-rg350-22c09f521aa5d4a220d53a8f8b3b277623b128a6.zip |
Removed more unused selectors - the canBeHere selector is replaced by cantBeHere in SCI1+
svn-id: r46011
-rw-r--r-- | engines/sci/engine/static_selectors.cpp | 8 | ||||
-rw-r--r-- | engines/sci/engine/vm.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp index fd07a3f994..828043cf67 100644 --- a/engines/sci/engine/static_selectors.cpp +++ b/engines/sci/engine/static_selectors.cpp @@ -70,16 +70,16 @@ static const SelectorRemap sci0SelectorRemap[] = { // Taken from Leisure Suit Larry 1 VGA (Full Game) static const SelectorRemap sci1SelectorRemap[] = { { "nodePtr", 44 }, { "cantBeHere", 57 }, { "topString", 101 }, - { "flags", 102 }, { "setCursor", 183 }, { "canBeHere", 232 }, - { "syncTime", 247 }, { "syncCue", 248 }, { 0, 0 } + { "flags", 102 }, { "setCursor", 183 }, { "syncTime", 247 }, + { "syncCue", 248 }, { 0, 0 } }; // Taken from KQ6 floppy (Full Game) static const SelectorRemap sci11SelectorRemap[] = { { "nodePtr", 41 }, { "cantBeHere", 54 }, { "topString", 98 }, { "flags", 99 }, { "scaleX", 104 }, { "scaleY", 105 }, - { "setCursor", 197 }, { "canBeHere", 264 }, { "syncTime", 279 }, - { "syncCue", 280 }, { 0, 0 } + { "setCursor", 197 }, { "syncTime", 279 }, { "syncCue", 280 }, + { 0, 0 } }; Common::StringList Kernel::checkStaticSelectorNames() { diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h index 3a3f48b3ac..ed1d978b56 100644 --- a/engines/sci/engine/vm.h +++ b/engines/sci/engine/vm.h @@ -146,7 +146,7 @@ struct SelectorCache { Selector b_movCnt, b_i1, b_i2, b_di, b_xAxis, b_incr; // Various Bresenham vars Selector xStep, yStep; // BR adjustments Selector moveSpeed; // Used for DoBresen - Selector canBeHere; // Funcselector: Checks for movement validity + Selector canBeHere; // Funcselector: Checks for movement validity in SCI0 Selector heading, mover; // Used in DoAvoider Selector doit; // Called (!) by the Animate() system call Selector isBlocked, looper; // Used in DoAvoider @@ -180,7 +180,7 @@ struct SelectorCache { Selector moveDone; // used for DoBresen // SCI1 selectors which have been moved a bit in SCI1.1, but otherwise static - Selector cantBeHere; + Selector cantBeHere; // Checks for movement avoidance in SCI1+. Replaces canBeHere Selector topString; // SCI1 scroll lists use this instead of lsTop Selector flags; |