[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.80,1.81

Max Horn fingolfin at users.sourceforge.net
Sun Jul 4 18:45:18 CEST 2004


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

Modified Files:
	scumm.cpp 
Log Message:
Get rid of old hack (possible thanks to Kirbens recent change to the createBoxMatrix opcode)

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- scumm.cpp	4 Jul 2004 06:14:17 -0000	1.80
+++ scumm.cpp	5 Jul 2004 01:33:51 -0000	1.81
@@ -2244,23 +2244,6 @@
 			a->moving = 0;
 		}
 	} else if (_version >= 7) {
-		if ((_gameId == GID_DIG) && a) {
-			// FIXME: This hack mostly is there to fix the tomb/statue room
-			// in The Dig. What happens there is that when you enter, you are
-			// placed at object 399, coords (307,141), which is in box 25.
-			// But then the entry script locks that and other boxes. Hence
-			// after the entry script runs, you basically can only do one thing
-			// in that room, and that is to leave it - which means the game
-			// is unfinishable.
-			// By calling adjustActorPos, we can solve the problem in this case:
-			// there is a very close box (box 12) which contains point (307,144).
-			// If we call adjustActorPos, Commander Low is moved into that box,
-			// and we can go on. But aqudran looked this up in his IMB DB for
-			// The DIG; and nothing like this is done there. Also I am pretty
-			// sure this used to work in 0.3.1. So apparently something broke
-			// down here, and I have no clue what that might be :-/
-			a->adjustActorPos();
-		}
 		if (camera._follows) {
 			a = derefActor(camera._follows, "startScene: follows");
 			setCameraAt(a->_pos.x, a->_pos.y);





More information about the Scummvm-git-logs mailing list