[Scummvm-cvs-logs] CVS: scummvm/saga scene.cpp,1.115,1.116

[Andrew Kurushin]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7713

Modified Files:
	scene.cpp 
Log Message:
fix end sequence - show inventory bug during converse

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- scene.cpp	5 Jul 2005 16:58:34 -0000	1.115
+++ scene.cpp	6 Jul 2005 17:51:41 -0000	1.116
@@ -489,6 +489,9 @@
 		event.data = current_pal;
 		q_event = _vm->_events->queue(&event);
 
+		//FIXME: do we really need two interface activation on load scene?
+		// i guess kTransitionFadeNoInterface should gone
+		/* 
 		if (loadSceneParams->transitionType != kTransitionFadeNoInterface) {
 			// Activate user interface
 			event.type = IMMEDIATE_EVENT;
@@ -497,7 +500,7 @@
 			event.time = 0;
 			event.duration = 0;
 			q_event = _vm->_events->chain(q_event, &event);
-		}
+		}*/
 
 		// set fade mode
 		event.type = IMMEDIATE_EVENT;
@@ -604,13 +607,15 @@
 
 		_vm->_events->queue(&event);
 
-		// Activate user interface
-		event.type = ONESHOT_EVENT;
-		event.code = INTERFACE_EVENT;
-		event.op = EVENT_ACTIVATE;
-		event.time = 0;
+		if (getFlags() & kSceneFlagShowCursor) {
+			// Activate user interface
+			event.type = ONESHOT_EVENT;
+			event.code = INTERFACE_EVENT;
+			event.op = EVENT_ACTIVATE;
+			event.time = 0;
 
-		_vm->_events->queue(&event);
+			_vm->_events->queue(&event);
+		}
 
 		// Begin palette cycle animation if present
 		event.type = ONESHOT_EVENT;