Changeset 2169 for code/branches/objecthierarchy/src/orxonox/objects

Timestamp:

Nov 9, 2008, 8:46:26 PM (16 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/objects

Files:

• Level.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/infos/Level.cc) (2 diffs)
• Level.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/infos/Level.h) (1 diff)

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: