[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.24,1.25

Jonathan Gray khalek at users.sourceforge.net
Sat Nov 16 19:28:02 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv5195

Modified Files:
	script_v1.cpp 
Log Message:
hack around another null dref for indy3, fixes 639201

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- script_v1.cpp	15 Nov 2002 12:21:30 -0000	1.24
+++ script_v1.cpp	17 Nov 2002 03:27:57 -0000	1.25
@@ -1470,6 +1470,8 @@
 
 	a = derefActorSafe(getVarOrDirectByte(0x80), "o5_putActorInRoom");
 	room = getVarOrDirectByte(0x40);
+
+	if (a == NULL) return; // FIXME - yet another null dref hack, see bug 639201
 	if (a->visible && _currentRoom != room && _vars[VAR_TALK_ACTOR] == a->number) {
 		clearMsgQueue();
 	}





More information about the Scummvm-git-logs mailing list