Changeset 5732

Timestamp:

Aug 31, 2009, 10:51:36 PM (15 years ago)

Author:

landauf

Message:

moved InGameConsole and Map into the overlays folder

Location:

code/branches/libraries2/src

Files:

• modules/gamestates/GSGraphics.cc (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/interfaces/RadarViewable.cc (modified) (1 diff)
• orxonox/objects/controllers/HumanController.cc (modified) (1 diff)
• orxonox/overlays/CMakeLists.txt (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (moved) (moved from code/branches/libraries2/src/orxonox/InGameConsole.cc)
• orxonox/overlays/InGameConsole.h (moved) (moved from code/branches/libraries2/src/orxonox/InGameConsole.h)
• orxonox/overlays/Map.cc (moved) (moved from code/branches/libraries2/src/orxonox/Map.cc)
• orxonox/overlays/Map.h (moved) (moved from code/branches/libraries2/src/orxonox/Map.h)

code/branches/libraries2/src/modules/gamestates/GSGraphics.cc

@@ -47 +47 @@
 #include "core/Loader.h"
 #include "core/XMLFile.h"
-#include "InGameConsole.h"
+#include "overlays/InGameConsole.h"
 #include "sound/SoundManager.h"
 
 // HACK:
-#include "Map.h"
+#include "overlays/Map.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/CMakeLists.txt

@@ -25 +25 @@
   PawnManager.cc
   PlayerManager.cc
-
-  InGameConsole.cc
-  Map.cc
 )
 ADD_SUBDIRECTORY(interfaces)

code/branches/libraries2/src/orxonox/interfaces/RadarViewable.cc

@@ -38 +38 @@
 #include "objects/worldentities/WorldEntity.h"
 #include "objects/Radar.h"
-#include "Map.h"
+#include "overlays/Map.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/objects/controllers/HumanController.cc

@@ -35 +35 @@
 #include "objects/gametypes/Gametype.h"
 #include "objects/infos/PlayerInfo.h"
-#include "Map.h"
+#include "overlays/Map.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/overlays/CMakeLists.txt

@@ -2 +2 @@
   OrxonoxOverlay.cc
   OverlayGroup.cc
+
+  InGameConsole.cc
+  Map.cc
 )