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

[thebluegr at users.sourceforge.net]

Revision: 43886
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43886&view=rev
Author:   thebluegr
Date:     2009-09-01 14:55:28 +0000 (Tue, 01 Sep 2009)

Log Message:
-----------
Fixed incorrect usage of ARRAYSIZE (thanks fingolfin)

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-09-01 13:04:38 UTC (rev 43885)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-09-01 14:55:28 UTC (rev 43886)
@@ -96,6 +96,7 @@
 	int count = ARRAYSIZE(sci0Selectors) + offset;
 	names.resize(count);
 	const SelectorRemap *selectorRemap = sci0SelectorRemap;
+	uint32 selectorRemapSize = 0;
 	int i;
 
 	for (i = 0; i < offset; i++)
@@ -106,6 +107,7 @@
 
 	if (version <= SCI_VERSION_01) {
 		selectorRemap = sci0SelectorRemap;
+		selectorRemapSize = ARRAYSIZE(sci0SelectorRemap);
 	} else {
 		int count2 = ARRAYSIZE(sci1Selectors);
 		names[handleIndex + offset] = "nodePtr";
@@ -115,10 +117,16 @@
 		for (i = count; i < count + count2; i++)
 			names[i] = sci1Selectors[i - count];
 
-		selectorRemap = (version < SCI_VERSION_1_1) ? sci1SelectorRemap : sci11SelectorRemap;
+		if (version < SCI_VERSION_1_1) {
+			selectorRemap = sci1SelectorRemap;
+			selectorRemapSize = ARRAYSIZE(sci1SelectorRemap);
+		} else {
+			selectorRemap = sci11SelectorRemap;
+			selectorRemapSize = ARRAYSIZE(sci11SelectorRemap);
+		}
 	}
 
-	for (uint32 k = 0; k < ARRAYSIZE(selectorRemap); k++) {
+	for (uint32 k = 0; k < selectorRemapSize; k++) {
 		if (selectorRemap[k].slot >= names.size())
 			names.resize(selectorRemap[k].slot + 1);
 		names[selectorRemap[k].slot] = selectorRemap[k].name;


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