diff options
| -rw-r--r-- | engines/sci/engine/script.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/engine/static_selectors.cpp | 15 | ||||
| -rw-r--r-- | engines/sci/engine/vm.h | 5 |
3 files changed, 1 insertions, 22 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 5b86d3171c..a21b70968a 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -180,17 +180,14 @@ void Kernel::mapSelectors() { FIND_SELECTOR(max); FIND_SELECTOR(cursor); FIND_SELECTOR(claimed); - FIND_SELECTOR(edgeHit); FIND_SELECTOR(wordFail); FIND_SELECTOR(syntaxFail); - FIND_SELECTOR(semanticFail); FIND_SELECTOR(cycler); FIND_SELECTOR(elements); FIND_SELECTOR(lsTop); FIND_SELECTOR(lsBottom); FIND_SELECTOR(lsLeft); FIND_SELECTOR(lsRight); - FIND_SELECTOR(baseSetter); FIND_SELECTOR(who); FIND_SELECTOR(distance); FIND_SELECTOR(mover); diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp index 1897748c6d..3e6b6f573b 100644 --- a/engines/sci/engine/static_selectors.cpp +++ b/engines/sci/engine/static_selectors.cpp @@ -90,17 +90,14 @@ static const SelectorRemap kq4_demo_selectors[] = { { "max", 37 }, { "cursor", 36 }, { "claimed", 76 }, - { "edgeHit", 225 }, { "wordFail", 71 }, { "syntaxFail", 72 }, - { "semanticFail", 73 }, { "cycler", 165 }, { "elements", 27 }, { "lsTop", 13 }, { "lsBottom", 15 }, { "lsLeft", 14 }, { "lsRight", 16 }, - { "baseSetter", 208 }, { "who", 39 }, { "distance", 173 }, { "mover", 59 }, @@ -171,17 +168,14 @@ static const SelectorRemap christmas1992_selectors[] = { { "max", 34 }, { "cursor", 33 }, { "claimed", 73 }, - { "edgeHit", 333 }, { "wordFail", 68 }, { "syntaxFail", 69 }, - { "semanticFail", 70 }, { "cycler", 255 }, { "elements", 24 }, { "lsTop", 10 }, { "lsBottom", 12 }, { "lsLeft", 11 }, { "lsRight", 13 }, - { "baseSetter", 310 }, { "who", 36 }, { "distance", 264 }, { "mover", 56 }, @@ -267,17 +261,14 @@ static const SelectorRemap lsl1_demo_selectors[] = { { "max", 37 }, { "cursor", 36 }, { "claimed", 76 }, - { "edgeHit", 321 }, { "wordFail", 71 }, { "syntaxFail", 72 }, - { "semanticFail", 73 }, { "cycler", 215 }, { "elements", 27 }, { "lsTop", 13 }, { "lsBottom", 15 }, { "lsLeft", 14 }, { "lsRight", 16 }, - { "baseSetter", 290 }, { "who", 39 }, { "distance", 224 }, { "mover", 59 }, @@ -366,17 +357,14 @@ static const SelectorRemap iceman_demo_selectors[] = { { "max", 37 }, { "cursor", 36 }, { "claimed", 76 }, - { "edgeHit", 236 }, { "wordFail", 71 }, { "syntaxFail", 72 }, - { "semanticFail", 73 }, { "cycler", 164 }, { "elements", 27 }, { "lsTop", 13 }, { "lsBottom", 15 }, { "lsLeft", 14 }, { "lsRight", 16 }, - { "baseSetter", 207 }, { "who", 39 }, { "distance", 173 }, { "mover", 59 }, @@ -449,17 +437,14 @@ static const SelectorRemap lsl5_demo_selectors[] = { { "max", 37 }, { "cursor", 36 }, { "claimed", 76 }, - { "edgeHit", 308 }, { "wordFail", 71 }, { "syntaxFail", 72 }, - { "semanticFail", 73 }, { "cycler", 212 }, { "elements", 27 }, { "lsTop", 13 }, { "lsBottom", 15 }, { "lsLeft", 14 }, { "lsRight", 16 }, - { "baseSetter", 277 }, { "who", 39 }, { "distance", 221 }, { "mover", 59 }, diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h index e9c2924232..5e88a323e5 100644 --- a/engines/sci/engine/vm.h +++ b/engines/sci/engine/vm.h @@ -146,7 +146,6 @@ struct selector_map_t { Selector client; /**< The object that wants to be moved */ Selector cycler; /**< The cycler of the client */ Selector dx, dy; /**< Deltas */ - Selector edgeHit; Selector b_movCnt, b_i1, b_i2, b_di, b_xAxis, b_incr; /**< Various Bresenham vars */ Selector completed; @@ -164,7 +163,7 @@ struct selector_map_t { Selector max, cursor; /**< Used by EditControl */ Selector mode; /**< Used by text controls (-> DrawControl()) */ - Selector wordFail, syntaxFail, semanticFail; /**< Used by Parse() */ + Selector wordFail, syntaxFail; /**< Used by Parse() */ Selector claimed; /**< Used generally by the event mechanism */ @@ -172,8 +171,6 @@ struct selector_map_t { Selector lsTop, lsBottom, lsRight, lsLeft; /**< Used by Animate() subfunctions and scroll list controls */ - Selector baseSetter; /**< Alternative baseSetter */ - Selector who, distance; /**< Used for 'chasing' movers */ Selector looper, mover, isBlocked, heading; /**< Used in DoAvoider */ |