[Scummvm-cvs-logs] CVS: scummvm/saga render.cpp,1.62,1.63 saveload.cpp,1.15,1.16 scene.cpp,1.109,1.110

[Andrew Kurushin]

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

Modified Files:
	render.cpp saveload.cpp scene.cpp 
Log Message:
placard workaround

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- render.cpp	4 Jun 2005 15:02:17 -0000	1.62
+++ render.cpp	16 Jun 2005 16:46:49 -0000	1.63
@@ -111,7 +111,7 @@
 	// Get mouse coordinates
 	mouse_pt = _vm->mousePos();
 
-	if (!(_flags & RF_PLACARD)) {
+	if (/*_vm->_interface->getMode() != kPanelPlacard*/!(_flags & RF_PLACARD)) {
 		// Display scene background
 		_vm->_scene->draw();
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saveload.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- saveload.cpp	5 Jun 2005 16:53:53 -0000	1.15
+++ saveload.cpp	16 Jun 2005 16:46:50 -0000	1.16
@@ -36,6 +36,7 @@
 #include "saga/interface.h"
 #include "saga/scene.h"
 #include "saga/render.h"
+#include "saga/events.h"
 
 #define CURRENT_SAGA_VER 2
 
@@ -225,6 +226,7 @@
 
 	_scene->clearSceneQueue();
 	_scene->changeScene(sceneNumber, ACTOR_NO_ENTRANCE, kTransitionNoFade);
+	_events->handleEvents(0); //dissolve back grounds
 
 	if (insetSceneNumber != sceneNumber) {
 		_render->drawScene();

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- scene.cpp	11 Jun 2005 17:24:06 -0000	1.109
+++ scene.cpp	16 Jun 2005 16:46:50 -0000	1.110
@@ -463,6 +463,16 @@
 	_sceneLoaded = true;
 	
 	q_event = NULL;
+
+	//fix placard bug 
+	//i guess we should remove RF_PLACARD flag - and use _interface->getMode()
+	event.type = ONESHOT_EVENT;
+	event.code = GRAPHICS_EVENT;
+	event.op = EVENT_CLEARFLAG;
+	event.param = RF_PLACARD; 
+
+	q_event = _vm->_events->chain(q_event, &event);
+
 	if (loadSceneParams->transitionType == kTransitionFade || 
 		loadSceneParams->transitionType == kTransitionFadeNoInterface) {