[Scummvm-cvs-logs] SF.net SVN: scummvm: [21025] tools/trunk/descumm.cpp

[kirben at users.sourceforge.net]

Revision: 21025
Author:   kirben
Date:     2006-03-03 05:11:04 -0800 (Fri, 03 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=21025&view=rev

Log Message:
-----------
Use correct var names table for SCUMM 0 - 5

Modified Paths:
--------------
    tools/trunk/descumm.cpp
Modified: tools/trunk/descumm.cpp
===================================================================
--- tools/trunk/descumm.cpp	2006-03-03 07:40:34 UTC (rev 21024)
+++ tools/trunk/descumm.cpp	2006-03-03 13:11:04 UTC (rev 21025)
@@ -476,25 +476,25 @@
 		
 	assert(i >= 0);
 
-	if (scriptVersion == 0 &&
-			i < ARRAYSIZE(var_names0) && var_names0[i]) {
-		buf += sprintf(buf, var_names0[i]);
+	if (scriptVersion >= 5 && 
+			i < ARRAYSIZE(var_names5) && var_names5[i]) {
+		buf += sprintf(buf, var_names5[i]);
 		return buf;
-	} else if (scriptVersion <= 2 &&
-			i < ARRAYSIZE(var_names2) && var_names2[i]) {
-		buf += sprintf(buf, var_names2[i]);
+	} else if (scriptVersion >= 4 && 
+			i < ARRAYSIZE(var_names4) && var_names4[i]) {
+		buf += sprintf(buf, var_names4[i]);
 		return buf;
 	} else if (scriptVersion >= 3 && 
 			i < ARRAYSIZE(var_names3) && var_names3[i]) {
 		buf += sprintf(buf, var_names3[i]);
 		return buf;
-	} else if (scriptVersion >= 4 && 
-			i < ARRAYSIZE(var_names4) && var_names4[i]) {
-		buf += sprintf(buf, var_names4[i]);
+	} else if (scriptVersion >= 1 &&
+			i < ARRAYSIZE(var_names2) && var_names2[i]) {
+		buf += sprintf(buf, var_names2[i]);
 		return buf;
-	} else if (scriptVersion >= 5 && 
-			i < ARRAYSIZE(var_names5) && var_names5[i]) {
-		buf += sprintf(buf, var_names5[i]);
+	} else if (scriptVersion == 0 &&
+			i < ARRAYSIZE(var_names0) && var_names0[i]) {
+		buf += sprintf(buf, var_names0[i]);
 		return buf;
 	} else if ((i & 0x8000) && (GF_UNBLOCKED || ZakFlag))
 		buf += sprintf(buf, "Var[%d Bit %d", (i & 0x0FFF) >> 4, i & 0x000F);