[Scummvm-cvs-logs] SF.net SVN: scummvm:[45659] scummvm/trunk/engines/sci/engine

[thebluegr at users.sourceforge.net]

Revision: 45659
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45659&view=rev
Author:   thebluegr
Date:     2009-11-04 12:16:08 +0000 (Wed, 04 Nov 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.cpp
    scummvm/trunk/engines/sci/engine/static_selectors.cpp
    scummvm/trunk/engines/sci/engine/vm.h

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2009-11-04 11:52:11 UTC (rev 45658)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2009-11-04 12:16:08 UTC (rev 45659)
@@ -242,6 +242,8 @@
 	FIND_SELECTOR(overlay);
 	FIND_SELECTOR(setCursor);
 	FIND_SELECTOR(topString);
+	FIND_SELECTOR(scaleX);
+	FIND_SELECTOR(scaleY);
 }
 
 void Kernel::dumpScriptObject(char *data, int seeker, int objsize) {

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-11-04 11:52:11 UTC (rev 45658)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-11-04 12:16:08 UTC (rev 45659)
@@ -82,11 +82,12 @@
 // Taken from KQ6 floppy (Full Game)
 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 }
 };
 
 Common::StringList Kernel::checkStaticSelectorNames() {

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2009-11-04 11:52:11 UTC (rev 45658)
+++ scummvm/trunk/engines/sci/engine/vm.h	2009-11-04 12:16:08 UTC (rev 45659)
@@ -129,6 +129,7 @@
 	Selector doit; /**< Called (!) by the Animate() system call */
 	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: */
 	Selector canBeHere; /**< Funcselector: Checks for movement validity */
@@ -496,6 +497,7 @@
  */
 int game_init(EngineState *s);
 
+#ifdef INCLUDE_OLDGFX
 /**
  * Initializes the graphics part of an SCI game
  * This function may only be called if game_init() did not initialize
@@ -504,6 +506,7 @@
  * @return		0 on success, 1 if an error occured
  */
 int game_init_graphics(EngineState *s);
+#endif
 
 /**
  * Initializes the sound part of an SCI game


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.