[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.58,1.59

[James Brown]

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

Modified Files:
	script_v5.cpp 
Log Message:
Fix assert with hack return. Need to fix these !a things properly one day.


Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- script_v5.cpp	1 May 2003 13:45:45 -0000	1.58
+++ script_v5.cpp	3 May 2003 07:23:53 -0000	1.59
@@ -883,7 +883,9 @@
 	obj = getVarOrDirectWord(0x40);
 
 	a = derefActorSafe(act, "o5_faceActor");
-	assert(a);
+	if (!a)
+		return;
+	//assert(a);
 
 	a->faceToObject(obj);
 }
@@ -1327,7 +1329,7 @@
 	// For small header games, we only call startScene if the room
 	// actually changed. This avoid unwanted (wrong) fades in Zak256
 	// and others. OTOH, it seems to cause a problem in newer games.
-	if (!(_features & GF_SMALL_HEADER) || room != _currentRoom)
+	//if (!(_features & GF_SMALL_HEADER) || room != _currentRoom)
 		startScene(room, 0, 0);
 	_fullRedraw = 1;
 }