[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.85,1.86

Gregory Montoir cyx at users.sourceforge.net
Sun Dec 7 07:20:00 CET 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv19447

Modified Files:
	cutaway.cpp 
Log Message:
(temporary) fix for cutaway_41f / command_0x178 graphical glitches

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- cutaway.cpp	6 Dec 2003 13:13:12 -0000	1.85
+++ cutaway.cpp	7 Dec 2003 15:19:00 -0000	1.86
@@ -983,6 +983,15 @@
 
 	_logic->oldRoom(_initialRoom);
 
+	// FIXME: this cutaway is played at the end of the command 0x178. This command
+	// setups some persons and associates bob slots to them. They should be hidden
+	// as their y coordinate is > 150, but they aren't ! A (temporary) workaround
+	// is to display the room with the panel area enabled.
+	int16 comPanel = _comPanel;
+	if (strcmp(_basename, "c41f") == 0 && _temporaryRoom == 106 && object.room == 41) {
+		comPanel = 1;
+	}
+
 	RoomDisplayMode mode;
 
 	if (!_logic->joeX() && !_logic->joeY()) {
@@ -996,7 +1005,7 @@
 			mode = RDM_FADE_JOE_XY;
 	}
 
-	_logic->roomDisplay(_logic->currentRoom(), mode, object.scale, _comPanel, true);
+	_logic->roomDisplay(_logic->currentRoom(), mode, object.scale, comPanel, true);
 
 	_currentImage = _logic->numFrames();
 





More information about the Scummvm-git-logs mailing list