Changeset 2169

Timestamp:

Nov 9, 2008, 8:46:26 PM (15 years ago)

Author:

landauf

Message:

moved Level from objects/infos to objects, because it's no longer called "LevelInfo"

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• LevelManager.cc (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (2 diffs)
• PlayerManager.cc (modified) (1 diff)
• objects/Level.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/infos/Level.cc) (2 diffs)
• objects/Level.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/infos/Level.h) (1 diff)

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

@@ -54 +54 @@
   objects/Script.cc
 
+  objects/Level.cc
   objects/Scene.cc
   objects/worldentities/WorldEntity.cc
@@ -82 +83 @@
 
   objects/infos/Info.cc
-  objects/infos/Level.cc
   objects/infos/PlayerInfo.cc
   objects/infos/HumanPlayer.cc

code/branches/objecthierarchy/src/orxonox/LevelManager.cc

@@ -31 +31 @@
 
 #include "PlayerManager.h"
-#include "objects/infos/Level.h"
+#include "objects/Level.h"
 #include "objects/infos/HumanPlayer.h"
 

code/branches/objecthierarchy/src/orxonox/OrxonoxPrereqs.h

@@ -85 +85 @@
 
     // objects
+    class Level;
     class Scene;
 
@@ -121 +122 @@
 
     class Info;
-    class Level;
     class PlayerInfo;
     class HumanPlayer;

code/branches/objecthierarchy/src/orxonox/PlayerManager.cc

@@ -33 +33 @@
 #include "core/Core.h"
 #include "core/CoreIncludes.h"
-#include "objects/infos/Level.h"
+#include "objects/Level.h"
 #include "objects/infos/HumanPlayer.h"
 

code/branches/objecthierarchy/src/orxonox/objects/Level.cc

@@ -38 +38 @@
 #include "Settings.h"
 #include "LevelManager.h"
-#include "PlayerInfo.h"
+#include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
@@ -48 +48 @@
     CreateFactory(Level);
 
-    Level::Level(BaseObject* creator) : Info(creator)
+    Level::Level(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     {
         RegisterObject(Level);

code/branches/objecthierarchy/src/orxonox/objects/Level.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "Info.h"
+#include "network/Synchronisable.h"
+#include "core/BaseObject.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Level : public Info
+    class _OrxonoxExport Level : public BaseObject, public Synchronisable
     {
         public: