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

[thebluegr at users.sourceforge.net]

Revision: 52647
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52647&view=rev
Author:   thebluegr
Date:     2010-09-09 07:42:25 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
SCI: Enabled the static selector remap code for SCI2+. The Torin demo works again

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-09-08 22:58:41 UTC (rev 52646)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-09-09 07:42:25 UTC (rev 52647)
@@ -155,15 +155,6 @@
 				names[i] = sci1Selectors[i - count];
 		}
 
-		for (const SelectorRemap *selectorRemap = sciSelectorRemap; selectorRemap->slot; ++selectorRemap) {
-			if (getSciVersion() >= selectorRemap->minVersion && getSciVersion() <= selectorRemap->maxVersion) {
-				const uint32 slot = selectorRemap->slot;
-				if (slot >= names.size())
-					names.resize(slot + 1);
-				names[slot] = selectorRemap->name;
-			}
-		}
-
 		// Now, we need to find out selectors which keep changing place...
 		// We do that by dissecting game objects, and looking for selectors at
 		// specified locations.
@@ -275,6 +266,15 @@
 #endif
 	}
 
+	for (const SelectorRemap *selectorRemap = sciSelectorRemap; selectorRemap->slot; ++selectorRemap) {
+		if (getSciVersion() >= selectorRemap->minVersion && getSciVersion() <= selectorRemap->maxVersion) {
+			const uint32 slot = selectorRemap->slot;
+			if (slot >= names.size())
+				names.resize(slot + 1);
+			names[slot] = selectorRemap->name;
+		}
+	}
+
 	return names;
 }
 


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