Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

    r2030 r2034  
    197197    void GSLevel::unloadLevel()
    198198    {
    199         Loader::unload(startFile_);
     199        //////////////////////////////////////////////////////////////////////////////////////////
     200        // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO //
     201        //////////////////////////////////////////////////////////////////////////////////////////
     202        // Loader::unload(startFile_); // TODO: REACTIVATE THIS IF LOADER::UNLOAD WORKS PROPERLY /
     203        //////////////////////////////////////////////////////////////////////////////////////////
     204
    200205        delete this->startFile_;
    201206    }
  • code/branches/objecthierarchy/src/orxonox/objects/Scene.cc

    r2033 r2034  
    4343    CreateFactory(Scene);
    4444
    45     Scene::Scene(BaseObject* creator) : BaseObject(creator)
     45    Scene::Scene(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
    4646    {
    4747        RegisterObject(Scene);
     
    8181        }
    8282        // test test test
    83        
     83
    8484        this->registerVariables();
    8585    }
  • code/branches/objecthierarchy/src/orxonox/objects/Test.cc

    r2019 r2034  
    3636        CreateFactory ( Test );
    3737
    38         Test::Test(BaseObject* creator) : BaseObject(creator)
     38        Test::Test(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
    3939        {
    4040                RegisterObject ( Test );
  • code/branches/objecthierarchy/src/orxonox/objects/infos/Info.cc

    r2019 r2034  
    3434namespace orxonox
    3535{
    36     Info::Info(BaseObject* creator) : BaseObject(creator)
     36    Info::Info(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
    3737    {
    3838        RegisterObject(Info);
  • code/branches/objecthierarchy/src/orxonox/objects/worldentities/SpawnPoint.h

    r2024 r2034  
    6060            void spawn(ControllableEntity* entity);
    6161
    62         public:
     62        private:
    6363            void setSpawnClassName(const std::string& name);
    6464            inline const std::string& getSpawnClassName() const
  • code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc

    r2023 r2034  
    4848    const Vector3 WorldEntity::UP    = Vector3::UNIT_Y;
    4949
    50     WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator)
     50    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
    5151    {
    5252        RegisterObject(WorldEntity);
Note: See TracChangeset for help on using the changeset viewer.