[Scummvm-cvs-logs] SF.net SVN: scummvm:[43779] scummvm/trunk/engines/sci/engine
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri Aug 28 12:13:04 CEST 2009
Revision: 43779
http://scummvm.svn.sourceforge.net/scummvm/?rev=43779&view=rev
Author: thebluegr
Date: 2009-08-28 10:13:03 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
- Removed the unused selectors "prevSignal", "who" and "distance" from the quick access selector array
- Added the "motionCue" and "egoMoveSpeed" selectors to the selector array, to limit the places where findSelector() is used only in debugging functions
- Reordered the selector initialization in mapSelectors(), so that their order matches the order found in vocab.997
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/script.cpp
scummvm/trunk/engines/sci/engine/vm.h
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-08-28 08:45:55 UTC (rev 43778)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-08-28 10:13:03 UTC (rev 43779)
@@ -397,7 +397,7 @@
if (version == SCI_VERSION_0_EARLY) {
features |= kFeatureOldScriptHeader | kFeatureOldGfxFunctions;
} else if (version == SCI_VERSION_0_LATE) {
- if (findSelector("motionCue") == -1)
+ if (_selectorMap.motionCue == -1)
features |= kFeatureOldGfxFunctions;
}
@@ -407,7 +407,7 @@
features |= kFeatureLofsAbsolute;
} else if (version == SCI_VERSION_1_EARLY) {
// Use heuristic
- if (findSelector("egoMoveSpeed") != -1)
+ if (_selectorMap.egoMoveSpeed != -1)
features |= kFeatureLofsAbsolute;
}
Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp 2009-08-28 08:45:55 UTC (rev 43778)
+++ scummvm/trunk/engines/sci/engine/script.cpp 2009-08-28 10:13:03 UTC (rev 43779)
@@ -127,75 +127,101 @@
#endif
void Kernel::mapSelectors() {
- FIND_SELECTOR(init);
- FIND_SELECTOR(play);
- FIND_SELECTOR(replay);
+ // species
+ // superClass
+ // -info-
+ FIND_SELECTOR(y);
FIND_SELECTOR(x);
- FIND_SELECTOR(y);
- FIND_SELECTOR(z);
- FIND_SELECTOR(priority);
FIND_SELECTOR(view);
FIND_SELECTOR(loop);
FIND_SELECTOR(cel);
- FIND_SELECTOR(brLeft);
- FIND_SELECTOR(brRight);
- FIND_SELECTOR(brTop);
- FIND_SELECTOR(brBottom);
- FIND_SELECTOR(xStep);
- FIND_SELECTOR(yStep);
- FIND_SELECTOR(nsBottom);
+ FIND_SELECTOR(underBits);
FIND_SELECTOR(nsTop);
FIND_SELECTOR(nsLeft);
+ FIND_SELECTOR(nsBottom);
+ FIND_SELECTOR(lsTop);
+ FIND_SELECTOR(lsLeft);
+ FIND_SELECTOR(lsBottom);
+ FIND_SELECTOR(lsRight);
FIND_SELECTOR(nsRight);
+ FIND_SELECTOR(signal);
+ FIND_SELECTOR(illegalBits);
+ FIND_SELECTOR(brTop);
+ FIND_SELECTOR(brLeft);
+ FIND_SELECTOR(brBottom);
+ FIND_SELECTOR(brRight);
+ // name
+ // key
+ // time
+ FIND_SELECTOR(text);
+ FIND_SELECTOR(elements);
+ // color
+ // back
+ FIND_SELECTOR(mode);
+ // style
+ FIND_SELECTOR(state);
FIND_SELECTOR(font);
- FIND_SELECTOR(text);
FIND_SELECTOR(type);
- FIND_SELECTOR(state);
- FIND_SELECTOR(doit);
- FIND_SELECTOR2(delete_, "delete");
- FIND_SELECTOR(signal);
- FIND_SELECTOR(underBits);
- FIND_SELECTOR(canBeHere);
+ // window
+ FIND_SELECTOR(cursor);
+ FIND_SELECTOR(max);
+ // mark
+ // who
+ FIND_SELECTOR(message);
+ // edit
+ FIND_SELECTOR(play);
+ FIND_SELECTOR(number);
+ FIND_SELECTOR(handle); // nodePtr
FIND_SELECTOR(client);
FIND_SELECTOR(dx);
FIND_SELECTOR(dy);
- FIND_SELECTOR(xStep);
- FIND_SELECTOR(yStep);
FIND_SELECTOR2(b_movCnt, "b-moveCnt");
FIND_SELECTOR2(b_i1, "b-i1");
FIND_SELECTOR2(b_i2, "b-i2");
FIND_SELECTOR2(b_di, "b-di");
FIND_SELECTOR2(b_xAxis, "b-xAxis");
FIND_SELECTOR2(b_incr, "b-incr");
- FIND_SELECTOR(completed);
- FIND_SELECTOR(illegalBits);
+ FIND_SELECTOR(xStep);
+ FIND_SELECTOR(yStep);
+ FIND_SELECTOR(moveSpeed);
+ FIND_SELECTOR(canBeHere); // cantBeHere
+ FIND_SELECTOR(heading);
+ FIND_SELECTOR(mover);
+ FIND_SELECTOR(doit);
+ FIND_SELECTOR(isBlocked);
+ FIND_SELECTOR(looper);
+ FIND_SELECTOR(priority);
+ FIND_SELECTOR(modifiers);
+ FIND_SELECTOR(replay);
+ // setPri
+ // at
+ // next
+ // done
+ // width
+ FIND_SELECTOR(wordFail);
+ FIND_SELECTOR(syntaxFail);
+ // semanticFail
+ // pragmaFail
+ // said
+ FIND_SELECTOR(claimed);
+ // value
+ // save
+ // restore
+ // title
+ // button
+ // icon
+ // draw
+ FIND_SELECTOR2(delete_, "delete");
+ FIND_SELECTOR(z);
+ // -----------------------------
+ FIND_SELECTOR(init);
FIND_SELECTOR(dispose);
- FIND_SELECTOR(prevSignal);
- FIND_SELECTOR(message);
- FIND_SELECTOR(modifiers);
+ FIND_SELECTOR(size);
+ FIND_SELECTOR(caller);
FIND_SELECTOR(cue);
FIND_SELECTOR(owner);
- FIND_SELECTOR(handle);
- FIND_SELECTOR(number);
- FIND_SELECTOR(max);
- FIND_SELECTOR(cursor);
- FIND_SELECTOR(claimed);
- FIND_SELECTOR(wordFail);
- FIND_SELECTOR(syntaxFail);
+ FIND_SELECTOR(completed);
FIND_SELECTOR(cycler);
- FIND_SELECTOR(elements);
- FIND_SELECTOR(lsTop);
- FIND_SELECTOR(lsBottom);
- FIND_SELECTOR(lsLeft);
- FIND_SELECTOR(lsRight);
- FIND_SELECTOR(who);
- FIND_SELECTOR(distance);
- FIND_SELECTOR(mover);
- FIND_SELECTOR(looper);
- FIND_SELECTOR(isBlocked);
- FIND_SELECTOR(heading);
- FIND_SELECTOR(mode);
- FIND_SELECTOR(caller);
FIND_SELECTOR(moveDone);
FIND_SELECTOR(vol);
FIND_SELECTOR(pri);
@@ -203,9 +229,7 @@
FIND_SELECTOR(sec);
FIND_SELECTOR(frame);
FIND_SELECTOR(dataInc);
- FIND_SELECTOR(size);
FIND_SELECTOR(palette);
- FIND_SELECTOR(moveSpeed);
FIND_SELECTOR(cantBeHere);
FIND_SELECTOR(nodePtr);
FIND_SELECTOR(flags);
@@ -215,6 +239,8 @@
FIND_SELECTOR(printLang);
FIND_SELECTOR(subtitleLang);
FIND_SELECTOR(parseLang);
+ FIND_SELECTOR(motionCue);
+ FIND_SELECTOR(egoMoveSpeed);
}
void Kernel::dumpScriptObject(char *data, int seeker, int objsize) {
Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h 2009-08-28 08:45:55 UTC (rev 43778)
+++ scummvm/trunk/engines/sci/engine/vm.h 2009-08-28 10:13:03 UTC (rev 43779)
@@ -152,8 +152,6 @@
Selector illegalBits; /**< Used by CanBeHere */
Selector dispose;
- Selector prevSignal; /**< Used by DoSound */
-
Selector message, modifiers; /**< Used by GetEvent */
Selector owner, handle;
@@ -171,8 +169,6 @@
Selector lsTop, lsBottom, lsRight, lsLeft; /**< Used by Animate() subfunctions and scroll list controls */
- Selector who, distance; /**< Used for 'chasing' movers */
-
Selector looper, mover, isBlocked, heading; /**< Used in DoAvoider */
Selector caller, moveDone, moveSpeed; /**< Used for DoBresen */
@@ -193,6 +189,9 @@
Selector nodePtr;
Selector flags;
+ Selector motionCue; /**< Used to determine if a game is using old gfx functions or not */
+ Selector egoMoveSpeed; /**< Used to determine if a game is using absolute lofs parameters */
+
Selector points; /**< Used by AvoidPath() */
Selector syncCue; /**< Used by DoSync() */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list