Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10570


Ignore:
Timestamp:
Sep 8, 2015, 10:47:36 PM (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core7/src/libraries/core/BaseObject.h

    r10555 r10570  
    161161            virtual void changedGametype() {}
    162162
    163             inline void setLevel(const StrongPtr<Level>& level)
    164             {
    165                 if (level != this->level_)
    166                 {
    167                     this->level_ = level;
    168                     this->changedLevel();
    169                 }
    170             }
     163            inline void setLevel(const StrongPtr<Level>& level) { this->level_ = level; }
    171164            inline const StrongPtr<Level>& getLevel() const { return this->level_; }
    172             virtual void changedLevel() {}
    173165
    174166            void addEventSource(BaseObject* source, const std::string& state);
  • code/branches/core7/src/orxonox/Scene.cc

    r10562 r10570  
    142142        registerVariable(this->bHasPhysics_,        VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::networkcallback_hasPhysics));
    143143        registerVariable(this->bShadows_,           VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::networkcallback_applyShadows));
    144         registerVariable(this->getLevel(),          VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::changedLevel));
    145144    }
    146145
Note: See TracChangeset for help on using the changeset viewer.