[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.400,1.401 script_v72he.cpp,2.98,2.99 script_v80he.cpp,2.25,2.26
Travis Howell
kirben at users.sourceforge.net
Thu Sep 16 07:36:47 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.399,1.400
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.401,1.402 script_v72he.cpp,2.99,2.100 script_v80he.cpp,2.26,2.27 script_v90he.cpp,2.35,2.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11674/scumm
Modified Files:
script_v6.cpp script_v72he.cpp script_v80he.cpp
Log Message:
No longer required.
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -d -r1.400 -r1.401
--- script_v6.cpp 16 Sep 2004 13:51:03 -0000 1.400
+++ script_v6.cpp 16 Sep 2004 14:31:16 -0000 1.401
@@ -3002,7 +3002,7 @@
int value = fetchScriptWord();
if (readVar(value) == 0) {
- defineArray(value, kIntArray, 0, num + 1);
+ defineArray(value, kIntArray, 0, num);
if (num > 0) {
int16 counter = 0;
do {
@@ -3010,7 +3010,7 @@
} while (++counter < num);
}
- shuffleArray(value, 1, num-1);
+ shuffleArray(value, 1, num);
writeArray(value, 0, 0, 2);
push(readArray(value, 0, 1));
return;
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.98
retrieving revision 2.99
diff -u -d -r2.98 -r2.99
--- script_v72he.cpp 16 Sep 2004 12:30:54 -0000 2.98
+++ script_v72he.cpp 16 Sep 2004 14:31:16 -0000 2.99
@@ -1699,7 +1699,7 @@
int value = fetchScriptWord();
if (readVar(value) == 0) {
- defineArray(value, kDwordArray, 0, 0, 0, num + 1);
+ defineArray(value, kDwordArray, 0, 0, 0, num);
if (num > 0) {
int16 counter = 0;
do {
@@ -1707,7 +1707,7 @@
} while (++counter < num);
}
- shuffleArray(value, 1, num-1);
+ shuffleArray(value, 1, num);
writeArray(value, 0, 0, 2);
push(readArray(value, 0, 1));
return;
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -d -r2.25 -r2.26
--- script_v80he.cpp 16 Sep 2004 12:30:54 -0000 2.25
+++ script_v80he.cpp 16 Sep 2004 14:31:16 -0000 2.26
@@ -614,7 +614,7 @@
int value = fetchScriptWord();
if (readVar(value) == 0) {
- defineArray(value, kDwordArray, 0, 0, 0, num + 1);
+ defineArray(value, kDwordArray, 0, 0, 0, num);
if (value & 0x8000)
localizeArray(readVar(value), 0xFFFFFFFF);
else if (value & 0x4000)
@@ -627,7 +627,7 @@
} while (++counter < num);
}
- shuffleArray(value, 1, num-1);
+ shuffleArray(value, 1, num);
writeArray(value, 0, 0, 2);
push(readArray(value, 0, 1));
return;
@@ -638,7 +638,7 @@
ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(value));
dim1end = FROM_LE_32(ah->dim1end);
- if (dim1end <= num) {
+ if (dim1end < num) {
int16 var_2 = readArray(value, 0, num - 1);
shuffleArray(value, 1, dim1end);
if (readArray(value, 0, 1) == var_2 && var_2 >= 3) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.399,1.400
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.401,1.402 script_v72he.cpp,2.99,2.100 script_v80he.cpp,2.26,2.27 script_v90he.cpp,2.35,2.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list