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

[thebluegr at users.sourceforge.net]

Revision: 50182
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50182&view=rev
Author:   thebluegr
Date:     2010-06-23 15:08:23 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
Removed a hack with SCI1.1 static selectors, and set them properly. This fixes scaling in the demo of QFG3

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

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-06-23 14:06:31 UTC (rev 50181)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-06-23 15:08:23 UTC (rev 50182)
@@ -100,10 +100,18 @@
     {    SCI_VERSION_0_EARLY,     SCI_VERSION_0_LATE,   "moveDone", 170 },
 	{    SCI_VERSION_0_EARLY,     SCI_VERSION_0_LATE,     "points", 316 },
 	{    SCI_VERSION_0_EARLY,     SCI_VERSION_0_LATE,      "flags", 368 },
-	{    SCI_VERSION_1_EARLY,        SCI_VERSION_1_1,    "nodePtr",  44 },
-	{     SCI_VERSION_1_LATE,        SCI_VERSION_1_1, "cantBeHere",  57 },
-	{    SCI_VERSION_1_EARLY,        SCI_VERSION_1_1,  "topString", 101 },
-	{    SCI_VERSION_1_EARLY,        SCI_VERSION_1_1,      "flags", 102 },
+	{    SCI_VERSION_1_EARLY,     SCI_VERSION_1_LATE,    "nodePtr",  44 },
+	{     SCI_VERSION_1_LATE,     SCI_VERSION_1_LATE, "cantBeHere",  57 },
+	{    SCI_VERSION_1_EARLY,     SCI_VERSION_1_LATE,  "topString", 101 },
+	{    SCI_VERSION_1_EARLY,     SCI_VERSION_1_LATE,      "flags", 102 },
+	// SCI1.1
+	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,    "nodePtr",  41 },
+	{        SCI_VERSION_1_1,        SCI_VERSION_1_1, "cantBeHere",  54 },
+	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,  "topString",  98 },
+	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,      "flags",  99 },
+	// quitGame
+	// restart
+	// hide
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,"scaleSignal", 103 },
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,     "scaleX", 104 },
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,     "scaleY", 105 },
@@ -146,9 +154,6 @@
 			if (selectorRemap->slot >= names.size())
 				names.resize(selectorRemap->slot + 1);
 			if (getSciVersion() >= selectorRemap->minVersion && getSciVersion() <= selectorRemap->maxVersion) {
-				// The SCI1 selectors we use exist in SCI1.1 too, offset by 3
-				if (selectorRemap->minVersion >= SCI_VERSION_1_EARLY && getSciVersion() == SCI_VERSION_1_1)
-					slot -= 3;
 				names[slot] = selectorRemap->name;
 			}
 		}


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