Changeset 10570 for code/branches/core7/src

Timestamp:

Sep 8, 2015, 10:47:36 PM (9 years ago)

Author:

landauf

Message:

not sure why Level was synchronized in Scene, but it doesn't seem to be necessary anymore

Location:

code/branches/core7/src

Files:

• libraries/core/BaseObject.h (modified) (1 diff)
• orxonox/Scene.cc (modified) (1 diff)

code/branches/core7/src/libraries/core/BaseObject.h

@@ -161 +161 @@
             virtual void changedGametype() {}
 
-            inline void setLevel(const StrongPtr<Level>& level)
-            {
-                if (level != this->level_)
-                {
-                    this->level_ = level;
-                    this->changedLevel();
-                }
-            }
+            inline void setLevel(const StrongPtr<Level>& level) { this->level_ = level; }
             inline const StrongPtr<Level>& getLevel() const { return this->level_; }
-            virtual void changedLevel() {}
 
             void addEventSource(BaseObject* source, const std::string& state);

code/branches/core7/src/orxonox/Scene.cc

@@ -142 +142 @@
         registerVariable(this->bHasPhysics_,        VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::networkcallback_hasPhysics));
         registerVariable(this->bShadows_,           VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::networkcallback_applyShadows));
-        registerVariable(this->getLevel(),          VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::changedLevel));
     }