[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.172,1.173

[Pawel Kolodziejski]

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

Modified Files:
	script_v6.cpp 
Log Message:
some changes for stampObject opcode to be more similiar dissassembly

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- script_v6.cpp	15 Jul 2003 21:33:57 -0000	1.172
+++ script_v6.cpp	20 Jul 2003 20:42:58 -0000	1.173
@@ -2787,9 +2787,6 @@
 	int object, x, y, state;
 
 	state = pop();
-	if (state == 0) {
-		state = 1;
-	}
 	y = pop();
 	x = pop();
 	object = pop();
@@ -2806,10 +2803,16 @@
 //		drawActor(object, mainBufferPtr, x_y, scale_x_y);
 		return;
 	}
+	
+	if (object == 0) {
+		state = 1;
+	}
 
-	warning("o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state);
-	setObjectState(object, state, x, y);
-	drawObject(getObjectIndex(object), 0);
+	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);
+	}
 }
 
 void Scumm_v6::o6_stopTalking() {