[Scummvm-cvs-logs] CVS: scummvm/sword2 sword2.cpp,1.107,1.108

[Torbj?rn Andersson]

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

Modified Files:
	sword2.cpp 
Log Message:
Don't show the restart/restore dialog if a boot parameter has been given.

And a teensy-weensy little cleanup.


Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- sword2.cpp	27 Mar 2004 12:07:07 -0000	1.107
+++ sword2.cpp	28 Mar 2004 13:12:10 -0000	1.108
@@ -313,7 +313,7 @@
 			if (!_gui->restoreControl())
 				startGame();
 		}
-	} else if (saveExists()) {
+	} else if (!_bootParam && saveExists()) {
 		int32 pars[2] = { 221, FX_LOOP };
 		bool result;
 
@@ -530,8 +530,8 @@
 
 	unpauseAllSound();
 
-	// put back game screen palette; see Build_display.cpp
-	setFullPalette(0xffffffff);
+	// put back game screen palette; see build_display.cpp
+	setFullPalette(-1);
 
 	// If graphics level at max, turn up again
 	if (_graphicsLevelFudged) {