[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.44,2.45 intern.h,2.160,2.161 script_v6.cpp,1.329,1.330 script_v6he.cpp,2.53,2.54

Travis Howell kirben at users.sourceforge.net
Wed Jun 2 06:33:02 CEST 2004


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

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

Ignore imuse control code in HE games
Add missing code for o6_stampobject (From diasm.)


Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.44
retrieving revision 2.45
diff -u -d -r2.44 -r2.45
--- imuse_player.cpp	14 Feb 2004 01:39:08 -0000	2.44
+++ imuse_player.cpp	2 Jun 2004 13:32:15 -0000	2.45
@@ -299,6 +299,9 @@
 		case 93: // Chorus Level
 			part->chorusLevel(param2);
 			break;
+		case 116: // Unknown
+			// FIXME: Often used in puttmoon
+			break;
 		case 123: // All Notes Off
 			part->allNotesOff();
 			break;

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.160
retrieving revision 2.161
diff -u -d -r2.160 -r2.161
--- intern.h	1 Jun 2004 22:06:05 -0000	2.160
+++ intern.h	2 Jun 2004 13:32:16 -0000	2.161
@@ -591,7 +591,6 @@
 	void o6_dummy();
 	void o6_kernelSetFunctions();
 	void o6_kernelGetFunctions();
-	void o6_stampObject();
 	void o6_openFile();
 	void o6_closeFile();
 	void o6_deleteFile();

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -d -r1.329 -r1.330
--- script_v6.cpp	8 Apr 2004 22:46:46 -0000	1.329
+++ script_v6.cpp	2 Jun 2004 13:32:16 -0000	1.330
@@ -2850,7 +2850,7 @@
 	int object, x, y, state;
 
 	// dummy opcode in tentacle
-	if (_version == 6)
+	if (_gameId == GID_TENTACLE)
 		return;
 
 	// V7 version
@@ -2858,10 +2858,10 @@
 	y = pop();
 	x = pop();
 	object = pop();
-	if (object < 30) {
-		if (state == 0) {
+	if (_version >= 7 && object < 30) {
+		if (state == 0)
 			state = 255;
-		}
+
 		debug(6, "o6_stampObject: (%d at (%d,%d) scale %d)", object, x, y, state);
 		Actor *a = derefActor(object, "o6_stampObject");
 		a->scalex = state;
@@ -2873,15 +2873,21 @@
 		return;
 	}
 	
-	if (object == 0) {
+	if (state == 0)
 		state = 1;
-	}
+
+	int objnum = getObjectIndex(object);
+	if (objnum == 0)
+		return;
 
 	if (x != -1) {
-		setObjectState(object, state, x, y);
-		drawObject(getObjectIndex(object), 0);
-		warning("o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state);
+		_objs[objnum].x_pos = x * 8;
+		_objs[objnum].y_pos = y * 8;
 	}
+
+	putState(object, state);
+	drawObject(objnum, 0);
+	debug(6, "o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state);
 }
 
 void ScummEngine_v6::o6_stopTalking() {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.53
retrieving revision 2.54
diff -u -d -r2.53 -r2.54
--- script_v6he.cpp	2 Jun 2004 01:54:59 -0000	2.53
+++ script_v6he.cpp	2 Jun 2004 13:32:16 -0000	2.54
@@ -1083,25 +1083,6 @@
 	++ctx->size;	
 }
 
-void ScummEngine_v6he::o6_stampObject() {
-	int object, x, y, state;
-	
-	state = pop();
-	if (state == 0) {
-		state = 1;
-	}
-	y = pop();
-	x = pop();
-	object = pop();
-	int objnum = getObjectIndex(object);
-	if (objnum == -1)
-		return;
-	_objs[objnum].x_pos = x * 8;
-	_objs[objnum].y_pos = y * 8;
-	putState(object, state);
-	drawObject(objnum, 0);
-}
-
 void ScummEngine_v6he::o6_openFile() {
 	int mode, len, slot, l, r;
 	byte filename[100];





More information about the Scummvm-git-logs mailing list