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

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/objects/pickup

Files:

• PickupInventory.cc (modified) (1 diff)
• PickupSpawner.cc (modified) (1 diff)

code/branches/resource/src/orxonox/objects/pickup/PickupInventory.cc

@@ -37 +37 @@
 
 #include "core/ConsoleCommand.h"
+#include "core/GUIManager.h"
 #include "core/input/InputManager.h"
-#include "gui/GUIManager.h"
 #include "objects/controllers/HumanController.h"
 #include "objects/worldentities/pawns/Pawn.h"

code/branches/resource/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -37 +37 @@
 
 #include "core/CoreIncludes.h"
+#include "core/GUIManager.h"     // HACK; see below
 #include "core/Template.h"
 #include "core/XMLPort.h"
-#include "gui/GUIManager.h"     // HACK; see below
 #include "objects/worldentities/pawns/Pawn.h"
 #include "PickupInventory.h"    // HACK; Only for hack, remove later