[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.62,1.63 logic.cpp,1.89,1.90

[David Eriksson]

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

Modified Files:
	cutaway.cpp logic.cpp 
Log Message:
Return mouse cursor and panel after cutaway.


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- cutaway.cpp	9 Nov 2003 21:24:23 -0000	1.62
+++ cutaway.cpp	10 Nov 2003 12:21:10 -0000	1.63
@@ -99,6 +99,7 @@
 
 	_comPanel = READ_BE_UINT16(ptr);
 	ptr += 2;
+	debug(0, "_comPanel = %i", _comPanel);
 
 	_cutawayObjectCount = (int16)READ_BE_UINT16(ptr);
 	ptr += 2;
@@ -1305,7 +1306,10 @@
 
 	talk(nextFilename);
 
-	if (_comPanel == 0 || (_comPanel == 2 && !_anotherCutaway)) {
+	// XXX removed the condition because otherwise sceneStop is not always
+	// executed in pair with sceneStart. */
+	
+	if (_comPanel == 0 || (_comPanel == 2 /*&& !_anotherCutaway*/)) {
 		_logic->sceneStop(true);
 		_comPanel = 0;
 	}

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- logic.cpp	9 Nov 2003 21:55:19 -0000	1.89
+++ logic.cpp	10 Nov 2003 12:21:10 -0000	1.90
@@ -2496,6 +2496,7 @@
 }
 
 void Logic::sceneStart(bool showMouseCursor) {
+	debug(0, "[Logic::sceneStart] _scene = %i", _scene);
 	_scene++;
 
 	_display->mouseCursorShow(showMouseCursor);
@@ -2509,6 +2510,7 @@
 }
 
 void Logic::sceneStop(bool showMouseCursor) {
+	debug(0, "[Logic::sceneStop] _scene = %i", _scene);
 	_scene--;
 
 	if (_scene > 0)