More BS2 restructuring.

The various game settings are no longer stored in the Gui class. They are
stored in the class that use them.

Code that doesn't belong in the Gui class, e.g. the "restart" code, has
been moved out of it.

Afterwards, the Gui class had been reduced to nothing more than a handful
of trivial methods for invoking the in-game dialogs. So the entire Gui
class has been removed.

svn-id: r16827

1 files changed, 10 insertions, 1 deletions

diff --git a/sword2/sword2.h b/sword2/sword2.h
index 8de53d64e4..8a30dad63e 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -111,6 +111,8 @@ private:
 	uint32 _totalScreenManagers;
 	uint32 _startRes;
 
+	bool _useSubtitles;
+
 	struct StartUp {
 		char description[MAX_description];
 
@@ -131,8 +133,15 @@ public:
 	int go();
 	int init(GameDetector &detector);
 
+	void registerDefaultSettings();
+	void readSettings();
+	void writeSettings();
+
 	void setupPersistentResources();
 
+	bool getSubtitles() { return _useSubtitles; }
+	void setSubtitles(bool b) { _useSubtitles = b; }
+
 	bool _quit;
 
 	uint32 _features;
@@ -145,7 +154,6 @@ public:
 	Mouse *_mouse;
 	Logic *_logic;
 	FontRenderer *_fontRenderer;
-	Gui *_gui;
 
 	Debugger *_debugger;
 
@@ -238,6 +246,7 @@ public:
 	void startGame();
 	void gameCycle();
 	void closeGame();
+	void restartGame();
 
 	void sleepUntil(uint32 time);