[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.175,2.176 script_v6.cpp,1.349,1.350 script_v8.cpp,2.253,2.254

[Travis Howell]

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

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

Match disasm., applies to The Dig too.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.175
retrieving revision 2.176
diff -u -d -r2.175 -r2.176
--- intern.h	3 Jul 2004 10:03:21 -0000	2.175
+++ intern.h	4 Jul 2004 12:06:17 -0000	2.176
@@ -682,7 +682,6 @@
 	void o8_blastText();
 
 	void o8_cursorCommand();
-	void o8_createBoxMatrix();
 	void o8_resourceRoutines();
 	void o8_roomOps();
 	void o8_actorOps();

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -r1.349 -r1.350
--- script_v6.cpp	30 Jun 2004 11:03:55 -0000	1.349
+++ script_v6.cpp	4 Jul 2004 12:06:17 -0000	1.350
@@ -1465,7 +1465,18 @@
 }
 
 void ScummEngine_v6::o6_createBoxMatrix() {
+	int i;
+	Actor *a;
+
 	createBoxMatrix();
+
+	if ((_gameId == GID_DIG) || (_gameId == GID_CMI)) {
+		for (i = 1; i < _numActors; i++) {
+			a = &_actors[i];
+			if (a && a->isInCurrentRoom())
+				a->putActor(a->_pos.x, a->_pos.y, _currentRoom);
+		}
+	}
 }
 
 void ScummEngine_v6::o6_resourceRoutines() {

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.253
retrieving revision 2.254
diff -u -d -r2.253 -r2.254
--- script_v8.cpp	28 Jun 2004 00:00:33 -0000	2.253
+++ script_v8.cpp	4 Jul 2004 12:06:17 -0000	2.254
@@ -251,7 +251,7 @@
 		OPCODE(o6_pickupObject),
 		OPCODE(o6_setBoxFlags),
 		/* A8 */
-		OPCODE(o8_createBoxMatrix),
+		OPCODE(o6_createBoxMatrix),
 		OPCODE(o6_invalid),
 		OPCODE(o8_resourceRoutines),
 		OPCODE(o8_roomOps),
@@ -779,19 +779,6 @@
 	VAR(VAR_USERPUT) = _userPut;
 }
 
-void ScummEngine_v8::o8_createBoxMatrix() {
-	int i;
-	Actor *a;
-
-	createBoxMatrix();
-
-	for (i = 1; i < _numActors; i++) {
-		a = &_actors[i];
-		if (a && a->isInCurrentRoom())
-			a->adjustActorPos();
-	}
-}
-
 void ScummEngine_v8::o8_resourceRoutines() {
 	byte subOp = fetchScriptByte();
 	int resid = pop();