Changeset 5621

Timestamp:

Aug 11, 2009, 12:50:58 AM (15 years ago)

Author:

landauf

Message:

Moved the Map from overlays to orxonox although it IS an OrxonoxOverlay - but it's a dependency to many other classes in orxonox, so I decided to temporary move it there (with respect to future changes).

Location:

code/branches/libraries/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Map.cc (copied) (copied from code/branches/libraries/src/orxonox/overlays/map/Map.cc)
• Map.h (copied) (copied from code/branches/libraries/src/orxonox/overlays/map/Map.h)
• gamestates/GSGraphics.cc (modified) (1 diff)
• interfaces/RadarViewable.cc (modified) (1 diff)
• objects/controllers/HumanController.cc (modified) (1 diff)
• overlays/map (deleted)

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

@@ -19 +19 @@
 
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
+  Main.cc
+
   CameraManager.cc
-  InGameConsole.cc
   LevelManager.cc
-  Main.cc
   PawnManager.cc
   PlayerManager.cc
+
+  InGameConsole.cc
+  Map.cc
 )
 ADD_SUBDIRECTORY(gamestates)

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

@@ -51 +51 @@
 
 // HACK:
-#include "overlays/map/Map.h"
+#include "Map.h"
 
 namespace orxonox

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

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

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

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