[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.34,1.35

[Max Horn]

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

Modified Files:
	script_v6.cpp 
Log Message:
fix for the cannon scene

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- script_v6.cpp	1 Jan 2003 18:22:40 -0000	1.34
+++ script_v6.cpp	5 Jan 2003 22:16:09 -0000	1.35
@@ -1101,7 +1101,7 @@
 	if (!a)
 		return;
 
-	if (room == 0xFF) {
+	if (room == 0xFF || room == 0x7FFFFFFF) {
 		room = a->room;
 	} else {
 		if (a->visible && _currentRoom != room && _vars[VAR_TALK_ACTOR] == a->number) {