Changeset 45659

Timestamp:

11/04/09 12:16:08 (5 weeks ago)

Author:

thebluegr

Message:

Added references to the scaleX and scaleY selectors, used for SCI1.1 view scaling

Location:

scummvm/trunk/engines/sci/engine

Files:

• script.cpp (modified) (1 diff)
• static_selectors.cpp (modified) (1 diff)
• vm.h (modified) (3 diffs)

scummvm/trunk/engines/sci/engine/script.cpp

@@ -243 +243 @@
         FIND_SELECTOR(setCursor);
         FIND_SELECTOR(topString);
+        FIND_SELECTOR(scaleX);
+        FIND_SELECTOR(scaleY);
 }
 

scummvm/trunk/engines/sci/engine/static_selectors.cpp

@@ -83 +83 @@
 static const SelectorRemap sci11SelectorRemap[] = {
         {      "nodePtr",  41 }, {   "cantBeHere",  54 }, {     "topString", 98 },
-        {        "flags",  99 }, {         "init", 110 }, {      "dispose", 111 },
-        {       "caller", 143 }, {          "cue", 145 }, {        "owner", 166 },
-        {       "setVol", 172 }, {    "setCursor", 197 }, {    "completed", 242 },
-        {       "cycler", 247 }, {     "distance", 256 }, {    "canBeHere", 264 },
-        {     "syncTime", 279 }, {      "syncCue", 280 }, {              0,   0 }
+        {        "flags",  99 }, {       "scaleX", 104 }, {       "scaleY", 105 },
+        {         "init", 110 }, {      "dispose", 111 }, {       "caller", 143 },
+        {          "cue", 145 }, {        "owner", 166 }, {       "setVol", 172 },
+        {    "setCursor", 197 }, {    "completed", 242 }, {       "cycler", 247 },
+        {     "distance", 256 }, {    "canBeHere", 264 }, {     "syncTime", 279 },
+        {      "syncCue", 280 }, {              0,   0 }
 };
 

scummvm/trunk/engines/sci/engine/vm.h

@@ -130 +130 @@
         Selector signal; /**< Used by Animate() to control a view's behaviour */
         Selector underBits; /**< Used by the graphics subroutines to store backupped BG pic data */
+        Selector scaleX, scaleY;        /**< SCI1.1 view scaling */
 
         /* The following selectors are used by the Bresenham syscalls: */
@@ -497 +498 @@
 int game_init(EngineState *s);
 
+#ifdef INCLUDE_OLDGFX
 /**
  * Initializes the graphics part of an SCI game
@@ -505 +507 @@
  */
 int game_init_graphics(EngineState *s);
+#endif
 
 /**