Changeset 3346 for code/branches/resource/src/orxonox/gamestates

Timestamp:

Jul 24, 2009, 9:37:19 PM (15 years ago)

Author:

rgrieder

Message:

Moved GraphicsManager and GUIManager to the core. Almost no actual code changes though, just moving (here was that Map-hack I had to move to GSGraphics).

Location:

code/branches/resource/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (3 diffs)
• GSLevel.cc (modified) (2 diffs)
• GSMainMenu.cc (modified) (1 diff)

code/branches/resource/src/orxonox/gamestates/GSGraphics.cc

@@ -45 +45 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
+#include "core/GraphicsManager.h"
+#include "core/GUIManager.h"
 #include "core/input/InputManager.h"
 #include "core/input/KeyBinder.h"
@@ -51 +53 @@
 #include "core/XMLFile.h"
 #include "overlays/console/InGameConsole.h"
-#include "gui/GUIManager.h"
 #include "sound/SoundManager.h"
-#include "GraphicsManager.h"
+
+// HACK:
+#include "overlays/map/Map.h"
 
 namespace orxonox
@@ -169 +172 @@
         this->inputManager_ = 0;
 
+        // HACK:
+        Map::hackDestroyMap();
+
         delete graphicsManager_;
 

code/branches/resource/src/orxonox/gamestates/GSLevel.cc

@@ -40 +40 @@
 #include "core/GameMode.h"
 #include "core/Core.h"
+#include "core/GraphicsManager.h"
+#include "core/GUIManager.h"
 #include "core/Loader.h"
 #include "core/XMLFile.h"
@@ -47 +49 @@
 #include "objects/quest/QuestManager.h"
 #include "overlays/notifications/NotificationManager.h"
-#include "gui/GUIManager.h"
 #include "CameraManager.h"
-#include "GraphicsManager.h"
 #include "LevelManager.h"
 #include "PlayerManager.h"

code/branches/resource/src/orxonox/gamestates/GSMainMenu.cc

@@ -36 +36 @@
 #include "core/Clock.h"
 #include "core/ConsoleCommand.h"
+#include "core/GraphicsManager.h"
+#include "core/GUIManager.h"
 #include "objects/Scene.h"
-#include "gui/GUIManager.h"
 #include "sound/SoundMainMenu.h"
-#include "GraphicsManager.h"
 
 namespace orxonox