Changeset 2034 for code/branches/objecthierarchy/src/orxonox
- Timestamp:
- Oct 28, 2008, 10:34:45 PM (16 years ago)
- Location:
- code/branches/objecthierarchy/src/orxonox
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc
r2030 r2034 197 197 void GSLevel::unloadLevel() 198 198 { 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 200 205 delete this->startFile_; 201 206 } -
code/branches/objecthierarchy/src/orxonox/objects/Scene.cc
r2033 r2034 43 43 CreateFactory(Scene); 44 44 45 Scene::Scene(BaseObject* creator) : BaseObject(creator) 45 Scene::Scene(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator) 46 46 { 47 47 RegisterObject(Scene); … … 81 81 } 82 82 // test test test 83 83 84 84 this->registerVariables(); 85 85 } -
code/branches/objecthierarchy/src/orxonox/objects/Test.cc
r2019 r2034 36 36 CreateFactory ( Test ); 37 37 38 Test::Test(BaseObject* creator) : BaseObject(creator) 38 Test::Test(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator) 39 39 { 40 40 RegisterObject ( Test ); -
code/branches/objecthierarchy/src/orxonox/objects/infos/Info.cc
r2019 r2034 34 34 namespace orxonox 35 35 { 36 Info::Info(BaseObject* creator) : BaseObject(creator) 36 Info::Info(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator) 37 37 { 38 38 RegisterObject(Info); -
code/branches/objecthierarchy/src/orxonox/objects/worldentities/SpawnPoint.h
r2024 r2034 60 60 void spawn(ControllableEntity* entity); 61 61 62 p ublic:62 private: 63 63 void setSpawnClassName(const std::string& name); 64 64 inline const std::string& getSpawnClassName() const -
code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc
r2023 r2034 48 48 const Vector3 WorldEntity::UP = Vector3::UNIT_Y; 49 49 50 WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator) 50 WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator) 51 51 { 52 52 RegisterObject(WorldEntity);
Note: See TracChangeset
for help on using the changeset viewer.