[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.203,1.204

Max Horn fingolfin at users.sourceforge.net
Sun Oct 26 04:12:01 CET 2003


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

Modified Files:
	script_v5.cpp 
Log Message:
workaround for bug #820357 (FOA: Talk to Sophia -> Atlantis/Great Machine = crash)

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- script_v5.cpp	17 Oct 2003 10:11:09 -0000	1.203
+++ script_v5.cpp	26 Oct 2003 12:09:08 -0000	1.204
@@ -595,6 +595,13 @@
 void ScummEngine_v5::o5_animateActor() {
 	int act = getVarOrDirectByte(0x80);
 	int anim = getVarOrDirectByte(0x40);
+	
+	// WORKAROUND bug #820357: This seems to be yet another script bug which
+	// the original engine let slip by. For details, refer to the tracker item.
+	if (_gameId == GID_INDY4 && vm.slot[_currentScript].number == 206 && _currentRoom == 17 && (act == 31 || act == 86)) {
+		return;
+	}
+	
 	Actor *a = derefActor(act, "o5_animateActor");
 	a->animateActor(anim);
 }





More information about the Scummvm-git-logs mailing list