Changeset 2034 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 28, 2008, 10:34:45 PM (16 years ago)

Author:

landauf

Message:

Synchronisable translates creator ↔ creatorID

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (1 diff)
• objects/Scene.cc (modified) (2 diffs)
• objects/Test.cc (modified) (1 diff)
• objects/infos/Info.cc (modified) (1 diff)
• objects/worldentities/SpawnPoint.h (modified) (1 diff)
• objects/worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -197 +197 @@
     void GSLevel::unloadLevel()
     {
-        Loader::unload(startFile_);
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO //
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // Loader::unload(startFile_); // TODO: REACTIVATE THIS IF LOADER::UNLOAD WORKS PROPERLY /
+        //////////////////////////////////////////////////////////////////////////////////////////
+
         delete this->startFile_;
     }

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

@@ -43 +43 @@
     CreateFactory(Scene);
 
-    Scene::Scene(BaseObject* creator) : BaseObject(creator)
+    Scene::Scene(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
     {
         RegisterObject(Scene);
@@ -81 +81 @@
         }
         // test test test
-        
+
         this->registerVariables();
     }

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

@@ -36 +36 @@
         CreateFactory ( Test );
 
-        Test::Test(BaseObject* creator) : BaseObject(creator)
+        Test::Test(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
         {
                 RegisterObject ( Test );

code/branches/objecthierarchy/src/orxonox/objects/infos/Info.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    Info::Info(BaseObject* creator) : BaseObject(creator)
+    Info::Info(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
     {
         RegisterObject(Info);

code/branches/objecthierarchy/src/orxonox/objects/worldentities/SpawnPoint.h

@@ -60 +60 @@
             void spawn(ControllableEntity* entity);
 
-        public:
+        private:
             void setSpawnClassName(const std::string& name);
             inline const std::string& getSpawnClassName() const

code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -48 +48 @@
     const Vector3 WorldEntity::UP    = Vector3::UNIT_Y;
 
-    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator)
+    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
     {
         RegisterObject(WorldEntity);