[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.80,2.81
Max Horn
fingolfin at users.sourceforge.net
Sat Jul 31 19:09:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1103
Modified Files:
script_v6he.cpp
Log Message:
Even more array code cleanup
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.80
retrieving revision 2.81
diff -u -d -r2.80 -r2.81
--- script_v6he.cpp 1 Aug 2004 01:54:37 -0000 2.80
+++ script_v6he.cpp 1 Aug 2004 02:07:57 -0000 2.81
@@ -1191,16 +1191,16 @@
newY = pop();
newX = pop();
- if (newY == 0)
+ if (newY == 0)
SWAP(newX, newY);
subcode = fetchScriptByte();
switch (subcode) {
case 199:
- redimArray(fetchScriptWord(), newX, newY, rtInventory);
+ redimArray(fetchScriptWord(), newX, newY, kIntArray);
break;
case 202:
- redimArray(fetchScriptWord(), newX, newY, rtCostume);
+ redimArray(fetchScriptWord(), newX, newY, kByteArray);
break;
default:
break;
@@ -1209,7 +1209,7 @@
void ScummEngine_v6he::redimArray(int arrayId, int newX, int newY, int type) {
// Used in mini game at Cosmic Dust Diner in puttmoon
- int var_2, var_4, ax, cx;
+ int newSize, oldSize;
if (readVar(arrayId) == 0)
error("redimArray: Reference to zeroed array pointer");
@@ -1219,20 +1219,13 @@
if (!ah)
error("redimArray: Invalid array (%d) reference", readVar(arrayId));
- if (type == rtInventory)
- var_2 = 2;
- else // rtCostume
- var_2 = 1;
-
- if (FROM_LE_16(ah->type) == rtInventory)
- var_4 = 2;
- else
- var_4 = 1;
+ newSize = (type == kIntArray) ? 2 : 1;
+ oldSize = (ah->type == kIntArray) ? 2 : 1;
- cx = var_2 * (newX + 1) * (newY + 1);
- ax = var_4 * FROM_LE_16(ah->dim1) * FROM_LE_16(ah->dim2);
+ newSize *= (newX + 1) * (newY + 1);
+ oldSize *= FROM_LE_16(ah->dim1) * FROM_LE_16(ah->dim2);
- if (ax != cx)
+ if (newSize != oldSize)
error("redimArray: array %d redim mismatch", readVar(arrayId));
ah->type = TO_LE_16(type);
More information about the Scummvm-git-logs
mailing list