[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.122,2.123 script_v6.cpp,1.234,1.235

[Travis Howell]

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

Modified Files:
	intern.h script_v6.cpp 
Log Message:

Add another HE games opcode and case.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.122
retrieving revision 2.123
diff -u -d -r2.122 -r2.123
--- intern.h	17 Dec 2003 17:12:09 -0000	2.122
+++ intern.h	2 Jan 2004 13:21:13 -0000	2.123
@@ -512,6 +512,7 @@
 	void o6_closeFile();
 	void o6_deleteFile();
 	void o6_readFile();
+	void o6_rename();
 	void o6_writeFile();
 	void o6_findAllObjects();
 	void o6_pickVarRandom();

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- script_v6.cpp	2 Jan 2004 00:36:20 -0000	1.234
+++ script_v6.cpp	2 Jan 2004 13:21:13 -0000	1.235
@@ -330,7 +330,7 @@
 		OPCODE(o6_writeFile),
 		OPCODE(o6_findAllObjects),
 		OPCODE(o6_deleteFile),
-		OPCODE(o6_invalid),
+		OPCODE(o6_rename),
 		/* E0 */
 		OPCODE(o6_unknownE0),
 		OPCODE(o6_unknownE1),
@@ -1624,7 +1624,12 @@
 		else
 			setPalette(a);
 		break;
-	case 221:
+	case 220:		// SO_DRAW_OBJECT_AT
+		a = pop();
+		b = pop();
+		warning("o6_roomops:180 (%d, %d): unimplemented", a, b);
+		break;
+	case 221:		// SO_DRAW_OBJECT_IMAGE
 		int len;
 		len = resStrLen(_scriptPointer);
 		_scriptPointer += len + 1;
@@ -2935,8 +2940,6 @@
 		_objs[objnum].y_pos = y * 8;
 		putState(object, state);
 		drawObject(objnum, 0);
-		warning("o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state);
-		
 		return;	
 	}
 
@@ -3036,6 +3039,37 @@
 	}
 
 	warning("stub o6_deleteFile(\"%s\")", filename + r);
+}
+
+void ScummEngine_v6::o6_rename() {
+	int len, r1, r2;
+	byte filename[100],filename2[100];
+
+	_msgPtrToAdd = filename;
+	_messagePtr = _scriptPointer;
+	addMessageToStack(_messagePtr);
+
+	len = resStrLen(_scriptPointer);
+	_scriptPointer += len + 1;
+
+	for (r1 = strlen((char*)filename); r1 != 0; r1--) {
+		if (filename[r1 - 1] == '\\')
+			break;
+	}
+
+	_msgPtrToAdd = filename2;
+	_messagePtr = _scriptPointer;
+	addMessageToStack(_messagePtr);
+
+	len = resStrLen(_scriptPointer);
+	_scriptPointer += len + 1;
+
+	for (r2 = strlen((char*)filename2); r2 != 0; r2--) {
+		if (filename2[r2 - 1] == '\\')
+			break;
+	}
+
+	warning("stub o6_rename(\"%s\" to \"%s\")", filename + r1, filename2 + r2);
 }
 
 int ScummEngine_v6::readFileToArray(int slot, int32 size) {