Some renaming (ironic in the light of Fingolfin's recent namespace

suggestion, but I prepared the patch long before reading the mail :-).

Also, the remaining parts of the control panel etc. have been moved into a
class of their own.

This is still work in progress. I'm well aware that some of the classes
aren't as well separated as they ought to be, and that using global
variables to keep track of the different classes probably isn't pretty.

svn-id: r10561

1 files changed, 22 insertions, 10 deletions

diff --git a/sword2/controls.h b/sword2/controls.h
index b1416bd27e..3c7b8613d1 100644
--- a/sword2/controls.h
+++ b/sword2/controls.h
@@ -20,16 +20,28 @@
 #ifndef	_CONTROL_S
 #define	_CONTROL_S
 
-uint32 Restore_control(void);
-void Save_control(void);
-void Quit_control(void);
-void Restart_control(void);
-void Option_control(void);
-int32 ReadOptionSettings(void);
-void UpdateGraphicsLevel(uint8 newLevel);
+class Sword2Gui {
+public:
+	int _baseSlot;
+	uint8 _currentGraphicsLevel;
 
-extern uint8 subtitles;			// text selected
-extern uint8 speechSelected;
-extern uint8 current_graphics_level;
+	uint8 _subtitles;
+	uint8 _speechSelected;
+	uint8 _stereoReversed;
+	uint8 _pointerTextSelected;
+
+	Sword2Gui() : _baseSlot(0), _stereoReversed(0),
+		_pointerTextSelected(0) {}
+
+	uint32 restoreControl(void);
+	void saveControl(void);
+	void quitControl(void);
+	void restartControl(void);
+	void optionControl(void);
+	int32 readOptionSettings(void);
+	void updateGraphicsLevel(uint8 newLevel);
+};
+
+extern Sword2Gui gui;
 
 #endif