[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.63,1.64 logic.h,1.65,1.66 queen.cpp,1.38,1.39

[David Eriksson]

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

Modified Files:
	cutaway.cpp logic.h queen.cpp 
Log Message:
Make the fix like the original game instead.


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cutaway.cpp	10 Nov 2003 12:21:10 -0000	1.63
+++ cutaway.cpp	10 Nov 2003 12:32:46 -0000	1.64
@@ -1306,10 +1306,7 @@
 
 	talk(nextFilename);
 
-	// XXX removed the condition because otherwise sceneStop is not always
-	// executed in pair with sceneStart. */
-	
-	if (_comPanel == 0 || (_comPanel == 2 /*&& !_anotherCutaway*/)) {
+	if (_comPanel == 0 || (_comPanel == 2 && !_anotherCutaway)) {
 		_logic->sceneStop(true);
 		_comPanel = 0;
 	}

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- logic.h	9 Nov 2003 21:31:18 -0000	1.65
+++ logic.h	10 Nov 2003 12:32:46 -0000	1.66
@@ -284,7 +284,13 @@
 	void inventoryDeleteItem(uint16 itemNum, bool refresh = true);
 	void inventoryScroll(uint16 count, bool up);
 
+	//! Ugly hack from original code
+	void sceneReset() { _scene = 0; }
+
+	//! Make a scene
 	void sceneStart(bool showMouseCursor);
+
+	//! Stop making a scene
 	void sceneStop(bool showMouseCursor);
 
 	//! Copy data from dummy object to object

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- queen.cpp	10 Nov 2003 01:04:10 -0000	1.38
+++ queen.cpp	10 Nov 2003 12:32:46 -0000	1.39
@@ -158,6 +158,9 @@
 			_graphics->loadPanel();
 			
 			_logic->playCutaway("cred.cut");
+
+			// Ugly fix from original code
+			_logic->sceneReset();
 		}
 
 		_logic->currentRoom(ROOM_HOTEL_LOBBY);