From effdfcd4b8c92475d41a15cefbfd711724280924 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 4 Nov 2009 12:16:08 +0000
Subject: Added references to the scaleX and scaleY selectors, used for SCI1.1
 view scaling

svn-id: r45659
---
 engines/sci/engine/script.cpp           |  2 ++
 engines/sci/engine/static_selectors.cpp | 11 ++++++-----
 engines/sci/engine/vm.h                 |  3 +++
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 4c1786c7d9..2ac51a05ac 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -242,6 +242,8 @@ void Kernel::mapSelectors() {
 	FIND_SELECTOR(overlay);
 	FIND_SELECTOR(setCursor);
 	FIND_SELECTOR(topString);
+	FIND_SELECTOR(scaleX);
+	FIND_SELECTOR(scaleY);
 }
 
 void Kernel::dumpScriptObject(char *data, int seeker, int objsize) {
diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp
index 98314378d4..b4fd18cd7a 100644
--- a/engines/sci/engine/static_selectors.cpp
+++ b/engines/sci/engine/static_selectors.cpp
@@ -82,11 +82,12 @@ static const SelectorRemap sci1SelectorRemap[] = {
 // 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() {
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index dddd5d9672..d09cb27e30 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -129,6 +129,7 @@ struct SelectorCache {
 	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 @@ const char *convertSierraGameId(const char *gameName, uint32 *gameFlags);
  */
 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 @@ int game_init(EngineState *s);
  * @return		0 on success, 1 if an error occured
  */
 int game_init_graphics(EngineState *s);
+#endif
 
 /**
  * Initializes the sound part of an SCI game
-- 
cgit v1.2.3