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

[thebluegr at users.sourceforge.net]

Revision: 43869
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43869&view=rev
Author:   thebluegr
Date:     2009-08-31 21:50:14 +0000 (Mon, 31 Aug 2009)

Log Message:
-----------
Cleanup

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	2009-08-31 21:43:05 UTC (rev 43868)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-08-31 21:50:14 UTC (rev 43869)
@@ -90,10 +90,6 @@
 	{     "syncTime", 279 }, {      "syncCue", 280 }
 };
 
-// A macro for loading one of the above tables in the function below
-#define USE_SELECTOR_TABLE(x) \
-
-
 Common::StringList Kernel::checkStaticSelectorNames(SciVersion version) {
 	Common::StringList names;
 	int offset = (version < SCI_VERSION_1_1) ? 3 : 0;
@@ -108,7 +104,9 @@
 	for (i = offset; i < count; i++)
 		names[i] = sci0Selectors[i - offset];
 
-	if (version >= SCI_VERSION_1_EGA) {
+	if (version <= SCI_VERSION_01) {
+		selectorRemap = sci0SelectorRemap;
+	} else {
 		int count2 = ARRAYSIZE(sci1Selectors);
 		names[handleIndex + offset] = "nodePtr";
 		names[canBeHereIndex + offset] = "cantBeHere";
@@ -116,19 +114,14 @@
 
 		for (i = count; i < count + count2; i++)
 			names[i] = sci1Selectors[i - count];
+
+		selectorRemap = (version < SCI_VERSION_1_1) ? sci1SelectorRemap : sci11SelectorRemap;
 	}
 
-	if (version <= SCI_VERSION_01)
-		selectorRemap = sci0SelectorRemap;
-	else if (version >= SCI_VERSION_1_EGA && version <= SCI_VERSION_1_LATE)
-		selectorRemap = sci1SelectorRemap;
-	else
-		selectorRemap = sci11SelectorRemap;
-
 	for (uint32 k = 0; k < ARRAYSIZE(selectorRemap); k++) {
-		if (selectorRemap[k].slot >= names.size()) \
-			names.resize(selectorRemap[k].slot + 1); \
-		names[selectorRemap[k].slot] = selectorRemap[k].name; \
+		if (selectorRemap[k].slot >= names.size())
+			names.resize(selectorRemap[k].slot + 1);
+		names[selectorRemap[k].slot] = selectorRemap[k].name;
 	}
 
 	return names;


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