[Scummvm-cvs-logs] CVS: scummvm/scumm intern_he.h,2.1,2.2 script_v100he.cpp,2.195,2.196 script_v72he.cpp,2.325,2.326

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5141/scumm

Modified Files:
	intern_he.h script_v100he.cpp script_v72he.cpp 
Log Message:

Change to int32 for safety.


Index: intern_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern_he.h,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- intern_he.h	4 Feb 2006 12:11:07 -0000	2.1
+++ intern_he.h	5 Feb 2006 00:50:03 -0000	2.2
@@ -262,7 +262,7 @@
 	void copyArrayHelper(ArrayHeader *ah, int idx2, int idx1, int len1, byte **data, int *size, int *num);
 	virtual int setupStringArray(int size);
 	int readFileToArray(int slot, int32 size);
-	void writeFileFromArray(int slot, int resID);
+	void writeFileFromArray(int slot, int32 resID);
 
 	virtual void decodeParseString(int a, int b);
 	void decodeScriptString(byte *dst, bool scriptString = false);

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.195
retrieving revision 2.196
diff -u -d -r2.195 -r2.196
--- script_v100he.cpp	5 Feb 2006 00:40:45 -0000	2.195
+++ script_v100he.cpp	5 Feb 2006 00:50:03 -0000	2.196
@@ -765,7 +765,7 @@
 void ScummEngine_v100he::o100_dimArray() {
 	int data;
 
-	int subOp = fetchScriptByte();
+	byte subOp = fetchScriptByte();
 
 	switch (subOp) {
 	case 41:		// SO_BIT_ARRAY
@@ -2853,7 +2853,7 @@
 
 void ScummEngine_v100he::o100_getVideoData() {
 	// Uses Bink video
-	int subOp = fetchScriptByte();
+	byte subOp = fetchScriptByte();
 	subOp -= 26;
 
 	switch (subOp) {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.325
retrieving revision 2.326
diff -u -d -r2.325 -r2.326
--- script_v72he.cpp	5 Feb 2006 00:40:48 -0000	2.325
+++ script_v72he.cpp	5 Feb 2006 00:50:03 -0000	2.326
@@ -1851,7 +1851,7 @@
 	debug(1, "o72_readFile: slot %d, subOp %d val %d", slot, subOp, val);
 }
 
-void ScummEngine_v72he::writeFileFromArray(int slot, int resID) {
+void ScummEngine_v72he::writeFileFromArray(int slot, int32 resID) {
 	ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, resID);
 	int32 size = (FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 1) *
 		(FROM_LE_32(ah->dim2end) - FROM_LE_32(ah->dim2start) + 1);
@@ -1860,7 +1860,7 @@
 }
 
 void ScummEngine_v72he::o72_writeFile() {
-	int resID = pop();
+	int32 resID = pop();
 	int slot = pop();
 	byte subOp = fetchScriptByte();