[Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.11,1.12

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv9595

Modified Files:
	controls.cpp 
Log Message:
Complete rewrite of the in-game dialogs (quit, restart, settings, save and
load). The new code is smaller, hopefully a bit easier to read and doesn't
use up all the CPU time.

Of course, it may some new and exciting bugs too. ;-)


Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- controls.cpp	26 Aug 2003 06:52:59 -0000	1.11
+++ controls.cpp	8 Sep 2003 06:38:16 -0000	1.12
@@ -17,13 +17,7 @@
  * $Header$
  */
 
-//-----------------------------------------------------------------------------------------------------------------------
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-//#include	"src\driver96.h"
+// FIXME: Are all of these includes really needed?
[...3810 lines suppressed...]
-
-
-		if	(!first)
-		{
-			first++;
-			SetFullPalette(CONTROL_PANEL_PALETTE);	// see Build_display.cpp (James17jun97)
-		}
-	}
-
-
-	Kill_option_surfaces();
+void Option_control(void) {	//Pete6Jun97
+	Sword2OptionsDialog optionsDialog;
 
-	return;	//just return to game
+	optionsDialog.run();
+	return;
 }
 
 void UpdateGraphicsLevel(uint8 newLevel) {	// (James13jun97)