[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.124,2.125 script_v72he.cpp,2.122,2.123 script_v80he.cpp,2.38,2.39

[Travis Howell]

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

Modified Files:
	script_v6he.cpp script_v72he.cpp script_v80he.cpp 
Log Message:

Filename string go a bit higher


Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.124
retrieving revision 2.125
diff -u -d -r2.124 -r2.125
--- script_v6he.cpp	22 Sep 2004 00:22:32 -0000	2.124
+++ script_v6he.cpp	22 Sep 2004 05:08:07 -0000	2.125
@@ -1031,8 +1031,7 @@
 void ScummEngine_v60he::o60_closeFile() {
 	int slot = pop();
 	if (slot != -1)
-		if (_hFileTable[slot].isOpen() == true)
-			_hFileTable[slot].close();
+		_hFileTable[slot].close();
 }
 
 void ScummEngine_v60he::o60_deleteFile() {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.122
retrieving revision 2.123
diff -u -d -r2.122 -r2.123
--- script_v72he.cpp	22 Sep 2004 03:56:27 -0000	2.122
+++ script_v72he.cpp	22 Sep 2004 05:08:07 -0000	2.123
@@ -1239,7 +1239,7 @@
 	int list[128];
 	byte string[2048];
 
-	debug(1,"o72_arrayOps: case %d\n", subOp);
+	debug(1,"o72_arrayOps: case %d", subOp);
 	switch (subOp) {
 	case 7:			// SO_ASSIGN_STRING
 		copyScriptString(string);
@@ -1756,7 +1756,7 @@
 
 void ScummEngine_v72he::o72_openFile() {
 	int mode, slot, l, r;
-	byte filename[100];
+	byte filename[256];
 
 	mode = pop();
 	copyScriptString(filename);

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -d -r2.38 -r2.39
--- script_v80he.cpp	22 Sep 2004 02:07:14 -0000	2.38
+++ script_v80he.cpp	22 Sep 2004 05:08:07 -0000	2.39
@@ -561,8 +561,11 @@
 
 void ScummEngine_v80he::loadImgSpot(int resId, int state, uint32 &w, uint32 &h) {
 	const uint8 *dataPtr = getResourceAddress(rtImage, resId);
-	if (!dataPtr)
-		error("loadImgSpot: unknown Image %d", resId);
+	if (!dataPtr) {
+		warning("loadImgSpot: unknown Image %d", resId);
+		w = h = 0;
+		return;
+	}
 
 	const uint8 *spotPtr = findWrappedBlock(MKID('SPOT'), dataPtr, state, 0);