[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.191,1.192

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21975

Modified Files:
	script_v6.cpp 
Log Message:
fixed size logic in readFileToArray()

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- script_v6.cpp	13 Sep 2003 16:25:33 -0000	1.191
+++ script_v6.cpp	13 Sep 2003 18:36:16 -0000	1.192
@@ -2371,7 +2371,7 @@
 	b = pop();
 	a = pop();
 
-	warning("o6_setBlastObjectWindow(%d, %d, %d, %d)", a, b, c, d);
+	warning("o6_bompWindow(%d, %d, %d, %d)", a, b, c, d);
 	// sub_274EF(a, b, c, d);
 }
 
@@ -2885,11 +2885,12 @@
 }
 
 int Scumm_v6::readFileToArray(int slot, int32 size) {
-	int rest = _hFileTable[slot].size() - _hFileTable[slot].pos();
+	if (size == 0)
+		size = _hFileTable[slot].size() - _hFileTable[slot].pos();
 	writeVar(0, 0);
-	defineArray(0, 3, 0, rest);
+	defineArray(0, 3, 0, size);
 	byte *ptr = getResourceAddress(rtString, readVar(0));
-	_hFileTable[slot].read(ptr, rest);
+	_hFileTable[slot].read(ptr, size);
 	return readVar(0);
 }