[Scummvm-cvs-logs] CVS: scummvm/sword2 build_display.cpp,1.51,1.52 controls.cpp,1.58,1.59 function.cpp,1.47,1.48 mouse.cpp,1.49,1.50

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv25414

Modified Files:
	build_display.cpp controls.cpp function.cpp mouse.cpp 
Log Message:
Made sure the screen is really cleared when drawing a dialog window, plus
some other cleanups. (This was a regression caused by the less stupid
screen updates implemented recently.)


Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- build_display.cpp	28 Dec 2003 15:08:11 -0000	1.51
+++ build_display.cpp	6 Jan 2004 13:33:28 -0000	1.52
@@ -51,14 +51,6 @@
 		_graphics->startRenderCycle();
 
 		while (1) {
-			// clear the back buffer, before building up the new
-			// screen from the back forwards
-
-			// FIXME: I'm not convinced that this is needed. Isn't
-			// the whole screen redrawn each time?
-
-			// _graphics->clearScene();
-
 			// first background parallax + related anims
 
 			// open the screen resource

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- controls.cpp	4 Jan 2004 15:11:29 -0000	1.58
+++ controls.cpp	6 Jan 2004 13:33:28 -0000	1.59
@@ -249,6 +249,13 @@
 Dialog::Dialog(Gui *gui)
 	: _numWidgets(0), _finish(false), _result(0), _gui(gui) {
 	_gui->_vm->setFullPalette(CONTROL_PANEL_PALETTE);
+	_gui->_vm->_graphics->clearScene();
+
+	// HACK: Since the dialogs don't do normal scene updates we need to
+	// trigger a full redraw manually.
+
+	_gui->_vm->_graphics->setNeedFullRedraw();
+	_gui->_vm->_graphics->updateDisplay();
 }
 
 Dialog::~Dialog() {
@@ -1554,8 +1561,6 @@
 
 	// In case we were dead - well we're not anymore!
 	DEAD = 0;
-
-	_vm->_graphics->clearScene();
 
 	// Restart the game. Clear all memory and reset the globals
 	temp_demo_flag = DEMO;

Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- function.cpp	5 Jan 2004 11:00:12 -0000	1.47
+++ function.cpp	6 Jan 2004 13:33:28 -0000	1.48
@@ -606,8 +606,6 @@
 	fnPlayMusic(pars);
 
 	_vm->_graphics->clearScene();
-	_vm->_graphics->setNeedFullRedraw();
-	_vm->_graphics->updateDisplay();
 	_vm->_graphics->fadeUp(0);
 
 	spriteInfo.scale = 0;

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- mouse.cpp	4 Jan 2004 15:05:54 -0000	1.49
+++ mouse.cpp	6 Jan 2004 13:33:28 -0000	1.50
@@ -188,9 +188,6 @@
 	// restore proper looping_music_id
 	_loopingMusicId = safe_looping_music_id;
 
-	// clear the screen & set up the new palette for the menus
-
-	_graphics->clearScene();
 	_graphics->processMenu();
 
 	// call the relevent screen
@@ -223,9 +220,8 @@
 		buildSystemMenu();
 	}
 
-	// Clear the screen & restore the location palette
+	// Back to the game again
 
-	_graphics->clearScene();
 	_graphics->processMenu();
 
 	// Reset game palette, but not after a successful restore or restart!