More cleanup. I've eliminated all the temporary global variables I've added

over the past few weeks, except for g_sword2. (Of course, this doesn't
necessarily make the code any prettier, but we can work on that later.)

svn-id: r11309

1 files changed, 2 insertions, 4 deletions

diff --git a/sword2/controls.h b/sword2/controls.h
index 169667cbbb..2b7675862e 100644
--- a/sword2/controls.h
+++ b/sword2/controls.h
@@ -26,12 +26,12 @@ class Sword2Engine;
 
 class Gui {
 private:
-	Sword2Engine *_vm;
-
 	int _musicVolume[17];
 	int _soundVolume[15];
 
 public:
+	Sword2Engine *_vm;
+
 	int _baseSlot;
 	uint8 _currentGraphicsLevel;
 
@@ -51,8 +51,6 @@ public:
 	void updateGraphicsLevel(int newLevel);
 };
 
-extern Gui *gui;
-
 } // End of namespace Sword2
 
 #endif