Changeset 9629 for code/branches/core6
- Timestamp:
- Aug 9, 2013, 9:26:46 PM (11 years ago)
- Location:
- code/branches/core6
- Files:
-
- 454 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core6/src/libraries/core/BaseObject.cc
r9590 r9629 55 55 @brief Constructor: Registers the object in the BaseObject-list. 56 56 */ 57 BaseObject::BaseObject( BaseObject* creator) : bInitialized_(false)57 BaseObject::BaseObject(Context* context) : bInitialized_(false) 58 58 { 59 59 RegisterRootObject(BaseObject); … … 70 70 this->mainStateFunctor_ = 0; 71 71 72 if (context) 73 this->setContext(context); 74 75 BaseObject* creator = orxonox_cast<BaseObject*>(context); 72 76 this->setCreator(creator); 73 77 if (this->creator_) … … 201 205 { 202 206 this->networkTemplateNames_.insert(temp->getLink()); 203 207 204 208 Template* link; 205 209 assert(!(link = Template::getTemplate(temp->getLink())) || !link->isLink()); -
code/branches/core6/src/libraries/core/BaseObject.h
r9607 r9629 65 65 66 66 public: 67 BaseObject( BaseObject* creator);67 BaseObject(Context* context); 68 68 virtual ~BaseObject(); 69 69 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); -
code/branches/core6/src/libraries/core/Loader.cc
r9557 r9629 209 209 210 210 orxout(verbose, context::loader) << " creating root-namespace..." << endl; 211 Namespace* rootNamespace = new Namespace( 0);211 Namespace* rootNamespace = new Namespace(Context::getRootContext()); 212 212 rootNamespace->setLoaderIndentation(" "); 213 213 rootNamespace->setFile(file); -
code/branches/core6/src/libraries/core/Namespace.cc
r7401 r9629 40 40 CreateFactory(Namespace); 41 41 42 Namespace::Namespace( BaseObject* creator) : BaseObject(creator),42 Namespace::Namespace(Context* context) : BaseObject(context), Context(context), 43 43 bAutogeneratedFileRootNamespace_(false), 44 44 bRoot_(false), -
code/branches/core6/src/libraries/core/Namespace.h
r7401 r9629 40 40 #include <string> 41 41 #include "BaseObject.h" 42 #include "object/Context.h" 42 43 43 44 namespace orxonox 44 45 { 45 class Namespace : public BaseObject 46 class Namespace : public BaseObject, public Context 46 47 { 47 48 public: 48 Namespace( BaseObject* creator);49 Namespace(Context* context); 49 50 virtual ~Namespace(); 50 51 -
code/branches/core6/src/libraries/core/Template.cc
r9564 r9629 40 40 CreateFactory(Template); 41 41 42 Template::Template( BaseObject* creator) : BaseObject(creator)42 Template::Template(Context* context) : BaseObject(context) 43 43 { 44 44 this->xmlelement_ = new TiXmlElement(""); -
code/branches/core6/src/libraries/core/Template.h
r7401 r9629 51 51 { 52 52 public: 53 Template( BaseObject* creator);53 Template(Context* context); 54 54 virtual ~Template(); 55 55 -
code/branches/core6/src/libraries/core/XMLPort.cc
r9564 r9629 89 89 orxout(verbose, context::xml) << object->getLoaderIndentation() << "fabricating " << child->Value() << "..." << endl; 90 90 91 BaseObject* newObject = orxonox_cast<BaseObject*>(identifier->fabricate(object ));91 BaseObject* newObject = orxonox_cast<BaseObject*>(identifier->fabricate(object->getContext())); 92 92 newObject->setLoaderIndentation(object->getLoaderIndentation() + " "); 93 93 -
code/branches/core6/src/libraries/core/class/Identifier.cc
r9606 r9629 174 174 @return The new object 175 175 */ 176 OrxonoxClass* Identifier::fabricate( BaseObject* creator)176 OrxonoxClass* Identifier::fabricate(Context* context) 177 177 { 178 178 if (this->factory_) 179 179 { 180 return this->factory_->fabricate(c reator);180 return this->factory_->fabricate(context); 181 181 } 182 182 else -
code/branches/core6/src/libraries/core/class/Identifier.h
r9626 r9629 125 125 inline bool hasFactory() const { return (this->factory_ != 0); } 126 126 127 OrxonoxClass* fabricate( BaseObject* creator);127 OrxonoxClass* fabricate(Context* context); 128 128 129 129 /// Returns true if the class can be loaded through XML. -
code/branches/core6/src/libraries/core/class/SubclassIdentifier.h
r9563 r9629 163 163 164 164 /// Creates a new object of the type of the assigned Identifier and dynamic_casts it to the minimal type given by T. 165 T* fabricate( BaseObject* creator) const166 { 167 OrxonoxClass* newObject = this->identifier_->fabricate(c reator);165 T* fabricate(Context* context) const 166 { 167 OrxonoxClass* newObject = this->identifier_->fabricate(context); 168 168 169 169 // Check if the creation was successful -
code/branches/core6/src/libraries/core/object/ClassFactory.h
r9602 r9629 55 55 public: 56 56 virtual ~Factory() {}; 57 virtual OrxonoxClass* fabricate( BaseObject* creator) = 0;57 virtual OrxonoxClass* fabricate(Context* context) = 0; 58 58 }; 59 59 … … 82 82 @return The new object 83 83 */ 84 inline OrxonoxClass* fabricate( BaseObject* creator)84 inline OrxonoxClass* fabricate(Context* context) 85 85 { 86 return static_cast<OrxonoxClass*>(new T(c reator));86 return static_cast<OrxonoxClass*>(new T(context)); 87 87 } 88 88 }; -
code/branches/core6/src/libraries/core/object/Context.cc
r9610 r9629 56 56 /*static*/ Context* Context::getRootContext() 57 57 { 58 static Context rootContext ;58 static Context rootContext(NULL); 59 59 return &rootContext; 60 60 } -
code/branches/core6/src/libraries/core/object/Context.h
r9610 r9629 48 48 static Context* getRootContext(); 49 49 50 Context(Context* context = NULL);50 Context(Context* context); 51 51 virtual ~Context(); 52 52 -
code/branches/core6/src/libraries/network/packet/Gamestate.cc
r9579 r9629 133 133 tempsize = it->getData(mem, this->sizes_, id, mode); 134 134 if ( tempsize != 0 ) 135 dataVector_.push_back( obj(it->getObjectID(), it->getC reatorID(), tempsize, mem-data_) );135 dataVector_.push_back( obj(it->getObjectID(), it->getContextID(), tempsize, mem-data_) ); 136 136 137 137 #ifndef NDEBUG … … 469 469 { 470 470 assert( objectHeader.getClassID() == htemp.getClassID() ); 471 assert( objectHeader.getC reatorID() == htemp.getCreatorID() );471 assert( objectHeader.getContextID() == htemp.getContextID() ); 472 472 return true; 473 473 } -
code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc
r9564 r9629 49 49 * Initializes all Variables and sets the right objectID_ 50 50 */ 51 Synchronisable::Synchronisable( BaseObject* creator)51 Synchronisable::Synchronisable(Context* context) 52 52 { 53 53 RegisterRootObject(Synchronisable); … … 69 69 this->setPriority( Priority::Normal ); 70 70 71 // get creator id 72 if( creator ) 73 this->creatorID_ = creator->getSceneID(); 74 else 75 this->creatorID_ = OBJECTID_UNKNOWN; 71 // get context id 72 this->contextID_ = this->findContextID(context); 76 73 } 77 74 … … 100 97 } 101 98 99 /** 100 * @brief Returns the id of the context. 101 * If the context is not Synchronisable, it moves on to its parent, recursively. 102 */ 103 uint32_t Synchronisable::findContextID(Context* context) 104 { 105 if (context == NULL) 106 return OBJECTID_UNKNOWN; 107 108 Synchronisable* synchronisableContext = orxonox_cast<Synchronisable*>(context); 109 if (synchronisableContext != NULL) 110 return synchronisableContext->getObjectID(); 111 else 112 return this->findContextID(context->getParentContext()); 113 } 102 114 103 115 /** … … 142 154 } 143 155 assert(id); 144 BaseObject* creator= 0;145 if (header.getC reatorID() != OBJECTID_UNKNOWN)146 { 147 Synchronisable* synchronisable_c reator = Synchronisable::getSynchronisable(header.getCreatorID());148 if (!synchronisable_c reator)156 Context* context = 0; 157 if (header.getContextID() != OBJECTID_UNKNOWN) 158 { 159 Synchronisable* synchronisable_context = Synchronisable::getSynchronisable(header.getContextID()); 160 if (!synchronisable_context) 149 161 { 150 162 mem += header.getDataSize()+SynchronisableHeader::getSize(); //.TODO: this suckz.... remove size from header … … 153 165 } 154 166 else 155 c reator = orxonox_cast<BaseObject*>(synchronisable_creator);167 context = orxonox_cast<Context*>(synchronisable_context); 156 168 } 157 169 assert(getSynchronisable(header.getObjectID())==0); //make sure no object with this id exists 158 BaseObject *bo = orxonox_cast<BaseObject*>(id->fabricate(c reator));170 BaseObject *bo = orxonox_cast<BaseObject*>(id->fabricate(context)); 159 171 assert(bo); 160 172 Synchronisable *no = orxonox_cast<Synchronisable*>(bo); … … 162 174 assert( Synchronisable::objectMap_.find(header.getObjectID()) == Synchronisable::objectMap_.end() ); 163 175 no->setObjectID(header.getObjectID()); 164 //no->c reatorID=header.getCreatorID(); //TODO: remove this176 //no->contextID=header.getContextID(); //TODO: remove this 165 177 no->setClassID(header.getClassID()); 166 assert(no->creatorID_ == header.getCreatorID()); 167 if( creator ) 168 bo->setLevel(creator->getLevel()); // Note: this ensures that the level is known on the client for child objects of the scene (and the scene itself) 178 assert(no->contextID_ == header.getContextID()); 179 if( context ) 180 { 181 BaseObject* boContext = orxonox_cast<BaseObject*>(context); 182 if (boContext) 183 bo->setLevel(boContext->getLevel()); // Note: this ensures that the level is known on the client for child objects of the scene (and the scene itself) 184 } 169 185 //assert(no->classID_ == header.getClassID()); 170 186 orxout(verbose, context::network) << "fabricate objectID_: " << no->objectID_ << " classID_: " << no->classID_ << endl; … … 274 290 275 291 header.setObjectID( this->objectID_ ); 276 header.setC reatorID( this->creatorID_ );292 header.setContextID( this->contextID_ ); 277 293 header.setClassID( this->classID_ ); 278 294 header.setDataSize( tempsize ); … … 331 347 SynchronisableHeader syncHeader2(mem); 332 348 assert( this->getClassID() == syncHeader2.getClassID() ); 333 assert( this->getC reatorID() == syncHeader2.getCreatorID() );349 assert( this->getContextID() == syncHeader2.getContextID() ); 334 350 mem += SynchronisableHeader::getSize(); 335 351 std::vector<SynchronisableVariableBase *>::iterator i; -
code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h
r9587 r9629 107 107 * @brief: stores information about a Synchronisable 108 108 * 109 * This class stores the information about a Synchronisable (objectID_, classID_, c reatorID_, dataSize)109 * This class stores the information about a Synchronisable (objectID_, classID_, contextID_, dataSize) 110 110 * in an emulated bitset. 111 111 * Bit 1 to 31 store the size of the Data the synchronisable consumes in the stream … … 113 113 * Byte 5 to 8: objectID_ 114 114 * Byte 9 to 12: classID_ 115 * Byte 13 to 16: c reatorID_115 * Byte 13 to 16: contextID_ 116 116 */ 117 117 class _NetworkExport SynchronisableHeader: public SynchronisableHeaderLight … … 126 126 inline void setClassID(uint32_t classID_) 127 127 { *(uint32_t*)(data_+SynchronisableHeaderLight::getSize()) = classID_; } 128 inline uint32_t getC reatorID() const128 inline uint32_t getContextID() const 129 129 { return *(uint32_t*)(data_+SynchronisableHeaderLight::getSize()+4); } 130 inline void setC reatorID(uint32_t creatorID_)131 { *(uint32_t*)(data_+SynchronisableHeaderLight::getSize()+4) = c reatorID_; }130 inline void setContextID(uint32_t contextID_) 131 { *(uint32_t*)(data_+SynchronisableHeaderLight::getSize()+4) = contextID_; } 132 132 inline void operator=(SynchronisableHeader& h) 133 133 { memcpy(data_, h.data_, getSize()); } … … 158 158 159 159 inline uint32_t getObjectID() const {return this->objectID_;} 160 inline unsigned int getC reatorID() const {return this->creatorID_;}160 inline unsigned int getContextID() const {return this->contextID_;} 161 161 inline uint32_t getClassID() const {return this->classID_;} 162 162 inline unsigned int getPriority() const { return this->objectFrequency_;} … … 170 170 171 171 protected: 172 Synchronisable( BaseObject* creator);172 Synchronisable(Context* context); 173 173 template <class T> void registerVariable(T& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false); 174 174 template <class T> void registerVariable(std::set<T>& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false); … … 176 176 177 177 void setPriority(unsigned int freq){ objectFrequency_ = freq; } 178 178 uint32_t findContextID(Context* context); 179 179 180 180 private: … … 189 189 190 190 uint32_t objectID_; 191 uint32_t c reatorID_;191 uint32_t contextID_; 192 192 uint32_t classID_; 193 193 -
code/branches/core6/src/libraries/tools/ResourceCollection.cc
r8858 r9629 39 39 CreateFactory(ResourceCollection); 40 40 41 ResourceCollection::ResourceCollection( BaseObject* creator)42 : BaseObject(c reator)41 ResourceCollection::ResourceCollection(Context* context) 42 : BaseObject(context) 43 43 { 44 44 RegisterObject(ResourceCollection); -
code/branches/core6/src/libraries/tools/ResourceCollection.h
r7401 r9629 41 41 { 42 42 public: 43 ResourceCollection( BaseObject* creator);43 ResourceCollection(Context* context); 44 44 virtual ~ResourceCollection(); 45 45 -
code/branches/core6/src/libraries/tools/ResourceLocation.cc
r8858 r9629 43 43 CreateFactory(ResourceLocation); 44 44 45 ResourceLocation::ResourceLocation( BaseObject* creator)46 : BaseObject(c reator)45 ResourceLocation::ResourceLocation(Context* context) 46 : BaseObject(context) 47 47 { 48 48 RegisterObject(ResourceLocation); -
code/branches/core6/src/libraries/tools/ResourceLocation.h
r7401 r9629 43 43 44 44 public: 45 ResourceLocation( BaseObject* creator);45 ResourceLocation(Context* context); 46 46 virtual ~ResourceLocation(); 47 47 -
code/branches/core6/src/modules/designtools/CreateStars.cc
r8351 r9629 39 39 CreateFactory(CreateStars); 40 40 41 CreateStars::CreateStars( BaseObject* creator) : BaseObject(creator)41 CreateStars::CreateStars(Context* context) : BaseObject(context) 42 42 { 43 43 RegisterObject(CreateStars); … … 69 69 for(int i=0; i < numStars_; i++) 70 70 { 71 Billboard* bb = new Billboard(this );71 Billboard* bb = new Billboard(this->getContext()); 72 72 73 73 float r = rnd(-colourDiff_,colourDiff_); -
code/branches/core6/src/modules/designtools/CreateStars.h
r7163 r9629 38 38 { 39 39 public: 40 CreateStars( orxonox::BaseObject* creator);40 CreateStars(Context* context); 41 41 virtual ~CreateStars(); 42 42 -
code/branches/core6/src/modules/docking/Dock.cc
r8858 r9629 53 53 registerStaticNetworkFunction(Dock::showDockingDialog); 54 54 55 Dock::Dock( BaseObject* creator) : StaticEntity(creator)55 Dock::Dock(Context* context) : StaticEntity(context) 56 56 { 57 57 RegisterObject(Dock); -
code/branches/core6/src/modules/docking/Dock.h
r9579 r9629 57 57 { // tolua_export 58 58 public: 59 Dock( BaseObject* creator);59 Dock(Context* context); 60 60 virtual ~Dock(); 61 61 -
code/branches/core6/src/modules/docking/DockToShip.cc
r8858 r9629 40 40 CreateFactory(DockToShip); 41 41 42 DockToShip::DockToShip( BaseObject* creator) : DockingEffect(creator)42 DockToShip::DockToShip(Context* context) : DockingEffect(context) 43 43 { 44 44 RegisterObject(DockToShip); -
code/branches/core6/src/modules/docking/DockToShip.h
r8706 r9629 57 57 { 58 58 public: 59 DockToShip( BaseObject* creator);59 DockToShip(Context* context); 60 60 virtual ~DockToShip(); 61 61 -
code/branches/core6/src/modules/docking/DockingAnimation.cc
r9579 r9629 39 39 namespace orxonox 40 40 { 41 DockingAnimation::DockingAnimation( BaseObject* creator) : BaseObject(creator)41 DockingAnimation::DockingAnimation(Context* context) : BaseObject(context) 42 42 { 43 43 RegisterObject(DockingAnimation); -
code/branches/core6/src/modules/docking/DockingAnimation.h
r9579 r9629 63 63 { 64 64 public: 65 DockingAnimation( BaseObject* creator);65 DockingAnimation(Context* context); 66 66 virtual ~DockingAnimation(); 67 67 -
code/branches/core6/src/modules/docking/DockingController.cc
r9579 r9629 40 40 CreateFactory(DockingController); 41 41 42 DockingController::DockingController( BaseObject* creator) : ArtificialController(creator)42 DockingController::DockingController(Context* context) : ArtificialController(context) 43 43 { 44 44 RegisterObject(DockingController); -
code/branches/core6/src/modules/docking/DockingController.h
r8706 r9629 42 42 { 43 43 public: 44 DockingController( BaseObject* creator);44 DockingController(Context* context); 45 45 virtual ~DockingController(); 46 46 -
code/branches/core6/src/modules/docking/DockingEffect.cc
r9579 r9629 37 37 namespace orxonox 38 38 { 39 DockingEffect::DockingEffect( BaseObject* creator) : BaseObject(creator)39 DockingEffect::DockingEffect(Context* context) : BaseObject(context) 40 40 { 41 41 RegisterObject(DockingEffect); -
code/branches/core6/src/modules/docking/DockingEffect.h
r9579 r9629 61 61 { 62 62 public: 63 DockingEffect( BaseObject* creator);63 DockingEffect(Context* context); 64 64 virtual ~DockingEffect(); 65 65 -
code/branches/core6/src/modules/docking/DockingTarget.cc
r9579 r9629 41 41 CreateFactory(DockingTarget); 42 42 43 DockingTarget::DockingTarget( BaseObject* creator) : StaticEntity(creator)43 DockingTarget::DockingTarget(Context* context) : StaticEntity(context) 44 44 { 45 45 RegisterObject(DockingTarget); -
code/branches/core6/src/modules/docking/DockingTarget.h
r8706 r9629 55 55 { 56 56 public: 57 DockingTarget( BaseObject* creator);57 DockingTarget(Context* context); 58 58 virtual ~DockingTarget(); 59 59 -
code/branches/core6/src/modules/docking/MoveToDockingTarget.cc
r9579 r9629 42 42 CreateFactory(MoveToDockingTarget); 43 43 44 MoveToDockingTarget::MoveToDockingTarget( BaseObject *creator) : DockingAnimation(creator)44 MoveToDockingTarget::MoveToDockingTarget(Context* context) : DockingAnimation(context) 45 45 { 46 46 RegisterObject(MoveToDockingTarget); … … 55 55 assert(this->parent_); 56 56 57 DockingController *dockingController = new DockingController(this );57 DockingController *dockingController = new DockingController(this->getContext()); 58 58 dockingController->setDock(this->parent_); 59 59 dockingController->setPlayer(player); -
code/branches/core6/src/modules/docking/MoveToDockingTarget.h
r8706 r9629 56 56 { 57 57 public: 58 MoveToDockingTarget( BaseObject* creator);58 MoveToDockingTarget(Context* context); 59 59 virtual ~MoveToDockingTarget(); 60 60 -
code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.cc
r9348 r9629 40 40 CreateFactory(OldRaceCheckPoint); 41 41 42 OldRaceCheckPoint::OldRaceCheckPoint( BaseObject* creator): DistanceTrigger(creator), RadarViewable(creator, static_cast<WorldEntity*>(this))42 OldRaceCheckPoint::OldRaceCheckPoint(Context* context): DistanceTrigger(context), RadarViewable(this, static_cast<WorldEntity*>(this)) 43 43 { 44 44 RegisterObject(OldRaceCheckPoint); -
code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.h
r9348 r9629 45 45 { 46 46 public: 47 OldRaceCheckPoint( BaseObject* creator);47 OldRaceCheckPoint(Context* context); 48 48 virtual ~OldRaceCheckPoint(); 49 49 -
code/branches/core6/src/modules/gametypes/OldSpaceRace.cc
r9348 r9629 38 38 CreateUnloadableFactory(OldSpaceRace); 39 39 40 OldSpaceRace::OldSpaceRace( BaseObject* creator) : Gametype(creator)40 OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context) 41 41 { 42 42 RegisterObject(OldSpaceRace); -
code/branches/core6/src/modules/gametypes/OldSpaceRace.h
r9348 r9629 52 52 53 53 public: 54 OldSpaceRace( BaseObject* creator);54 OldSpaceRace(Context* context); 55 55 virtual ~OldSpaceRace() {} 56 56 -
code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc
r9554 r9629 43 43 CreateFactory(RaceCheckPoint); 44 44 45 RaceCheckPoint::RaceCheckPoint( BaseObject* creator) : DistanceMultiTrigger(creator),46 RadarViewable( creator, static_cast<WorldEntity*> (this))45 RaceCheckPoint::RaceCheckPoint(Context* context) : DistanceMultiTrigger(context), 46 RadarViewable(this, static_cast<WorldEntity*> (this)) 47 47 { 48 48 RegisterObject(RaceCheckPoint); -
code/branches/core6/src/modules/gametypes/RaceCheckPoint.h
r9554 r9629 45 45 { 46 46 public: 47 RaceCheckPoint( BaseObject* creator);47 RaceCheckPoint(Context* context); 48 48 virtual ~RaceCheckPoint(); 49 49 -
code/branches/core6/src/modules/gametypes/SpaceRace.cc
r9526 r9629 42 42 CreateUnloadableFactory(SpaceRace); 43 43 44 SpaceRace::SpaceRace( BaseObject* creator) : Gametype(creator)44 SpaceRace::SpaceRace(Context* context) : Gametype(context) 45 45 { 46 46 RegisterObject(SpaceRace); -
code/branches/core6/src/modules/gametypes/SpaceRace.h
r9263 r9629 54 54 55 55 public: 56 SpaceRace( BaseObject* creator);56 SpaceRace(Context* context); 57 57 virtual ~SpaceRace() {} 58 58 -
code/branches/core6/src/modules/gametypes/SpaceRaceBot.cc
r9526 r9629 31 31 CreateFactory(SpaceRaceBot); 32 32 33 SpaceRaceBot::SpaceRaceBot( BaseObject* creator) : Bot(creator){33 SpaceRaceBot::SpaceRaceBot(Context* context) : Bot(context){ 34 34 RegisterObject(SpaceRaceBot); 35 35 this->defaultController_ = Class(SpaceRaceController);// ClassByString("") -
code/branches/core6/src/modules/gametypes/SpaceRaceBot.h
r9526 r9629 41 41 { 42 42 public: 43 SpaceRaceBot( BaseObject* creator);43 SpaceRaceBot(Context* context); 44 44 virtual ~SpaceRaceBot() {} 45 45 }; -
code/branches/core6/src/modules/gametypes/SpaceRaceController.cc
r9554 r9629 52 52 * Idea: Find static Point (checkpoints the spaceship has to reach) 53 53 */ 54 SpaceRaceController::SpaceRaceController( BaseObject* creator) :55 ArtificialController(c reator)54 SpaceRaceController::SpaceRaceController(Context* context) : 55 ArtificialController(context) 56 56 { 57 57 RegisterObject(SpaceRaceController) -
code/branches/core6/src/modules/gametypes/SpaceRaceController.h
r9526 r9629 65 65 66 66 public: 67 SpaceRaceController( BaseObject* creator);67 SpaceRaceController(Context* context); 68 68 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 69 69 virtual ~SpaceRaceController(); -
code/branches/core6/src/modules/gametypes/SpaceRaceManager.cc
r9526 r9629 42 42 CreateFactory(SpaceRaceManager); 43 43 44 SpaceRaceManager::SpaceRaceManager( BaseObject* creator) :45 BaseObject(c reator)44 SpaceRaceManager::SpaceRaceManager(Context* context) : 45 BaseObject(context) 46 46 { 47 47 RegisterObject(SpaceRaceManager); -
code/branches/core6/src/modules/gametypes/SpaceRaceManager.h
r9526 r9629 55 55 56 56 public: 57 SpaceRaceManager( BaseObject* creator);57 SpaceRaceManager(Context* context); 58 58 virtual ~SpaceRaceManager() ; 59 59 -
code/branches/core6/src/modules/notifications/NotificationDispatcher.cc
r8891 r9629 57 57 Default constructor. Initializes the object. 58 58 */ 59 NotificationDispatcher::NotificationDispatcher( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)59 NotificationDispatcher::NotificationDispatcher(Context* context) : BaseObject(context), Synchronisable(context) 60 60 { 61 61 RegisterObject(NotificationDispatcher); -
code/branches/core6/src/modules/notifications/NotificationDispatcher.h
r8891 r9629 76 76 { 77 77 public: 78 NotificationDispatcher( BaseObject* creator); //!< Default constructor. Initializes the object.78 NotificationDispatcher(Context* context); //!< Default constructor. Initializes the object. 79 79 virtual ~NotificationDispatcher(); //!< Destructor. 80 80 -
code/branches/core6/src/modules/notifications/NotificationQueue.cc
r9253 r9629 52 52 The creator of the NotificationQueue. 53 53 */ 54 NotificationQueue::NotificationQueue( BaseObject* creator) : BaseObject(creator), Synchronisable(creator), registered_(false)54 NotificationQueue::NotificationQueue(Context* context) : BaseObject(context), Synchronisable(context), registered_(false) 55 55 { 56 56 RegisterObject(NotificationQueue); -
code/branches/core6/src/modules/notifications/NotificationQueue.h
r8706 r9629 94 94 95 95 public: 96 NotificationQueue( BaseObject* creator);96 NotificationQueue(Context* context); 97 97 virtual ~NotificationQueue(); 98 98 -
code/branches/core6/src/modules/notifications/NotificationQueueCEGUI.cc
r8858 r9629 50 50 /*static*/ const std::string NotificationQueueCEGUI::NOTIFICATION_LAYER("NotificationLayer"); 51 51 52 NotificationQueueCEGUI::NotificationQueueCEGUI( BaseObject* creator) : NotificationQueue(creator)52 NotificationQueueCEGUI::NotificationQueueCEGUI(Context* context) : NotificationQueue(context) 53 53 { 54 54 RegisterObject(NotificationQueueCEGUI); -
code/branches/core6/src/modules/notifications/NotificationQueueCEGUI.h
r8706 r9629 70 70 71 71 public: 72 NotificationQueueCEGUI( BaseObject* creator);72 NotificationQueueCEGUI(Context* context); 73 73 virtual ~NotificationQueueCEGUI(); 74 74 -
code/branches/core6/src/modules/notifications/dispatchers/CommandNotification.cc
r9550 r9629 50 50 Default Constructor. Registers the object and initializes variables. 51 51 */ 52 CommandNotification::CommandNotification( BaseObject* creator) : NotificationDispatcher(creator)52 CommandNotification::CommandNotification(Context* context) : NotificationDispatcher(context) 53 53 { 54 54 RegisterObject(CommandNotification); -
code/branches/core6/src/modules/notifications/dispatchers/CommandNotification.h
r7552 r9629 70 70 71 71 public: 72 CommandNotification( BaseObject* creator); //!< Default Constructor.72 CommandNotification(Context* context); //!< Default Constructor. 73 73 virtual ~CommandNotification(); //!< Destructor. 74 74 -
code/branches/core6/src/modules/notifications/dispatchers/SimpleNotification.cc
r8706 r9629 45 45 Default Constructor. Registers the object and initializes variables. 46 46 */ 47 SimpleNotification::SimpleNotification( BaseObject* creator) : NotificationDispatcher(creator)47 SimpleNotification::SimpleNotification(Context* context) : NotificationDispatcher(context) 48 48 { 49 49 RegisterObject(SimpleNotification); -
code/branches/core6/src/modules/notifications/dispatchers/SimpleNotification.h
r7552 r9629 67 67 { 68 68 public: 69 SimpleNotification( BaseObject* creator); //!< Default Constructor.69 SimpleNotification(Context* context); //!< Default Constructor. 70 70 virtual ~SimpleNotification(); //!< Destructor. 71 71 -
code/branches/core6/src/modules/objects/Attacher.cc
r6417 r9629 36 36 CreateFactory(Attacher); 37 37 38 Attacher::Attacher( BaseObject* creator) : StaticEntity(creator)38 Attacher::Attacher(Context* context) : StaticEntity(context) 39 39 { 40 40 RegisterObject(Attacher); -
code/branches/core6/src/modules/objects/Attacher.h
r7601 r9629 48 48 { 49 49 public: 50 Attacher( BaseObject* creator);50 Attacher(Context* context); 51 51 virtual ~Attacher() {} 52 52 -
code/branches/core6/src/modules/objects/ForceField.cc
r8858 r9629 53 53 Constructor. Registers the object and initializes some values. 54 54 */ 55 ForceField::ForceField( BaseObject* creator) : StaticEntity(creator)55 ForceField::ForceField(Context* context) : StaticEntity(context) 56 56 { 57 57 RegisterObject(ForceField); -
code/branches/core6/src/modules/objects/ForceField.h
r8397 r9629 86 86 { 87 87 public: 88 ForceField( BaseObject* creator);88 ForceField(Context* context); 89 89 virtual ~ForceField(); 90 90 -
code/branches/core6/src/modules/objects/Planet.cc
r8858 r9629 47 47 * @brief Constructor 48 48 */ 49 Planet::Planet( BaseObject* creator) : MovableEntity(creator)49 Planet::Planet(Context* context) : MovableEntity(context) 50 50 { 51 51 RegisterObject(Planet); -
code/branches/core6/src/modules/objects/Planet.h
r7601 r9629 48 48 { 49 49 public: 50 Planet( BaseObject* creator);50 Planet(Context* context); 51 51 52 52 virtual ~Planet(); -
code/branches/core6/src/modules/objects/Script.cc
r8858 r9629 61 61 The creator of this object. 62 62 */ 63 Script::Script( BaseObject* creator) : BaseObject(creator)63 Script::Script(Context* context) : BaseObject(context) 64 64 { 65 65 RegisterObject(Script); -
code/branches/core6/src/modules/objects/Script.h
r7601 r9629 95 95 { 96 96 public: 97 Script( BaseObject* creator);97 Script(Context* context); 98 98 virtual ~Script(); 99 99 -
code/branches/core6/src/modules/objects/SpaceBoundaries.cc
r9600 r9629 44 44 CreateFactory(SpaceBoundaries); 45 45 46 SpaceBoundaries::SpaceBoundaries( BaseObject* creator) : StaticEntity(creator)46 SpaceBoundaries::SpaceBoundaries(Context* context) : StaticEntity(context) 47 47 { 48 48 RegisterObject(SpaceBoundaries); … … 104 104 if (current == this->billboards_.size()) 105 105 { 106 Billboard* billboard = new Billboard(this );106 Billboard* billboard = new Billboard(this->getContext()); 107 107 billboard->setPosition(position); 108 108 billboard->setSyncMode(ObjectDirection::None); -
code/branches/core6/src/modules/objects/SpaceBoundaries.h
r9579 r9629 75 75 { 76 76 public: 77 SpaceBoundaries( BaseObject* creator);77 SpaceBoundaries(Context* context); 78 78 ~SpaceBoundaries(); 79 79 -
code/branches/core6/src/modules/objects/Turret.cc
r9526 r9629 40 40 * @brief Constructor 41 41 */ 42 Turret::Turret( BaseObject* creator) : SpaceShip(creator)42 Turret::Turret(Context* context) : SpaceShip(context) 43 43 { 44 44 RegisterObject(Turret); 45 this->controller_ = new WaypointPatrolController(this );45 this->controller_ = new WaypointPatrolController(this->getContext()); 46 46 } 47 47 -
code/branches/core6/src/modules/objects/Turret.h
r9526 r9629 45 45 { 46 46 public: 47 Turret( BaseObject* creator);47 Turret(Context* context); 48 48 virtual ~Turret(); 49 49 -
code/branches/core6/src/modules/objects/collisionshapes/BoxCollisionShape.cc
r8858 r9629 48 48 Constructor. Registers and initializes the object. 49 49 */ 50 BoxCollisionShape::BoxCollisionShape( BaseObject* creator) : CollisionShape(creator)50 BoxCollisionShape::BoxCollisionShape(Context* context) : CollisionShape(context) 51 51 { 52 52 RegisterObject(BoxCollisionShape); -
code/branches/core6/src/modules/objects/collisionshapes/BoxCollisionShape.h
r8706 r9629 57 57 { 58 58 public: 59 BoxCollisionShape( BaseObject* creator);59 BoxCollisionShape(Context* context); 60 60 virtual ~BoxCollisionShape(); 61 61 -
code/branches/core6/src/modules/objects/collisionshapes/ConeCollisionShape.cc
r8858 r9629 48 48 Constructor. Registers and initializes the object. 49 49 */ 50 ConeCollisionShape::ConeCollisionShape( BaseObject* creator) : CollisionShape(creator)50 ConeCollisionShape::ConeCollisionShape(Context* context) : CollisionShape(context) 51 51 { 52 52 RegisterObject(ConeCollisionShape); -
code/branches/core6/src/modules/objects/collisionshapes/ConeCollisionShape.h
r8706 r9629 55 55 { 56 56 public: 57 ConeCollisionShape( BaseObject* creator);57 ConeCollisionShape(Context* context); 58 58 virtual ~ConeCollisionShape(); 59 59 -
code/branches/core6/src/modules/objects/collisionshapes/PlaneCollisionShape.cc
r8858 r9629 48 48 Constructor. Registers and initializes the object. 49 49 */ 50 PlaneCollisionShape::PlaneCollisionShape( BaseObject* creator) : CollisionShape(creator)50 PlaneCollisionShape::PlaneCollisionShape(Context* context) : CollisionShape(context) 51 51 { 52 52 RegisterObject(PlaneCollisionShape); -
code/branches/core6/src/modules/objects/collisionshapes/PlaneCollisionShape.h
r8706 r9629 57 57 { 58 58 public: 59 PlaneCollisionShape( BaseObject* creator);59 PlaneCollisionShape(Context* context); 60 60 virtual ~PlaneCollisionShape(); 61 61 -
code/branches/core6/src/modules/objects/collisionshapes/SphereCollisionShape.cc
r8858 r9629 48 48 Constructor. registers and initializes the object. 49 49 */ 50 SphereCollisionShape::SphereCollisionShape( BaseObject* creator) : CollisionShape(creator)50 SphereCollisionShape::SphereCollisionShape(Context* context) : CollisionShape(context) 51 51 { 52 52 RegisterObject(SphereCollisionShape); -
code/branches/core6/src/modules/objects/collisionshapes/SphereCollisionShape.h
r8706 r9629 55 55 { 56 56 public: 57 SphereCollisionShape( BaseObject* creator);57 SphereCollisionShape(Context* context); 58 58 virtual ~SphereCollisionShape(); 59 59 -
code/branches/core6/src/modules/objects/eventsystem/EventDispatcher.cc
r5929 r9629 37 37 CreateFactory(EventDispatcher); 38 38 39 EventDispatcher::EventDispatcher( BaseObject* creator) : BaseObject(creator)39 EventDispatcher::EventDispatcher(Context* context) : BaseObject(context) 40 40 { 41 41 RegisterObject(EventDispatcher); -
code/branches/core6/src/modules/objects/eventsystem/EventDispatcher.h
r7601 r9629 46 46 { 47 47 public: 48 EventDispatcher( BaseObject* creator);48 EventDispatcher(Context* context); 49 49 virtual ~EventDispatcher(); 50 50 -
code/branches/core6/src/modules/objects/eventsystem/EventFilter.cc
r8858 r9629 38 38 CreateFactory(EventFilter); 39 39 40 EventFilter::EventFilter( BaseObject* creator) : BaseObject(creator)40 EventFilter::EventFilter(Context* context) : BaseObject(context) 41 41 { 42 42 RegisterObject(EventFilter); -
code/branches/core6/src/modules/objects/eventsystem/EventFilter.h
r7601 r9629 46 46 { 47 47 public: 48 EventFilter( BaseObject* creator);48 EventFilter(Context* context); 49 49 virtual ~EventFilter(); 50 50 -
code/branches/core6/src/modules/objects/eventsystem/EventListener.cc
r8858 r9629 37 37 CreateFactory(EventListener); 38 38 39 EventListener::EventListener( BaseObject* creator) : BaseObject(creator)39 EventListener::EventListener(Context* context) : BaseObject(context) 40 40 { 41 41 RegisterObject(EventListener); -
code/branches/core6/src/modules/objects/eventsystem/EventListener.h
r7601 r9629 47 47 { 48 48 public: 49 EventListener( BaseObject* creator);49 EventListener(Context* context); 50 50 virtual ~EventListener(); 51 51 -
code/branches/core6/src/modules/objects/eventsystem/EventName.cc
r5929 r9629 34 34 CreateFactory(EventName); 35 35 36 EventName::EventName( BaseObject* creator) : BaseObject(creator)36 EventName::EventName(Context* context) : BaseObject(context) 37 37 { 38 38 RegisterObject(EventName); -
code/branches/core6/src/modules/objects/eventsystem/EventName.h
r7601 r9629 45 45 { 46 46 public: 47 EventName( BaseObject* creator);47 EventName(Context* context); 48 48 virtual ~EventName() {} 49 49 }; -
code/branches/core6/src/modules/objects/eventsystem/EventTarget.cc
r8858 r9629 35 35 CreateFactory(EventTarget); 36 36 37 EventTarget::EventTarget( BaseObject* creator) : BaseObject(creator)37 EventTarget::EventTarget(Context* context) : BaseObject(context) 38 38 { 39 39 RegisterObject(EventTarget); -
code/branches/core6/src/modules/objects/eventsystem/EventTarget.h
r7601 r9629 46 46 { 47 47 public: 48 EventTarget( BaseObject* creator);48 EventTarget(Context* context); 49 49 virtual ~EventTarget(); 50 50 -
code/branches/core6/src/modules/objects/triggers/CheckPoint.cc
r9348 r9629 44 44 CreateFactory(CheckPoint); 45 45 46 CheckPoint::CheckPoint( BaseObject* creator)47 : DistanceTrigger(c reator)48 , RadarViewable( creator, static_cast<WorldEntity*>(this))46 CheckPoint::CheckPoint(Context* context) 47 : DistanceTrigger(context) 48 , RadarViewable(this, static_cast<WorldEntity*>(this)) 49 49 { 50 50 RegisterObject(CheckPoint); -
code/branches/core6/src/modules/objects/triggers/CheckPoint.h
r7601 r9629 55 55 { 56 56 public: 57 CheckPoint( BaseObject* creator);57 CheckPoint(Context* context); 58 58 virtual ~CheckPoint(); 59 59 -
code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.cc
r8858 r9629 53 53 Default Constructor. Registers the object and initializes default values. 54 54 */ 55 DistanceMultiTrigger::DistanceMultiTrigger( BaseObject* creator) : MultiTrigger(creator)55 DistanceMultiTrigger::DistanceMultiTrigger(Context* context) : MultiTrigger(context) 56 56 { 57 57 RegisterObject(DistanceMultiTrigger); -
code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.h
r9557 r9629 95 95 96 96 public: 97 DistanceMultiTrigger( BaseObject* creator); // Default Constructor. Registers the object and initializes default values.97 DistanceMultiTrigger(Context* context); // Default Constructor. Registers the object and initializes default values. 98 98 virtual ~DistanceMultiTrigger(); // Destructor. 99 99 -
code/branches/core6/src/modules/objects/triggers/DistanceTrigger.cc
r8858 r9629 57 57 The creator of this trigger. 58 58 */ 59 DistanceTrigger::DistanceTrigger( BaseObject* creator) : Trigger(creator)59 DistanceTrigger::DistanceTrigger(Context* context) : Trigger(context) 60 60 { 61 61 RegisterObject(DistanceTrigger); -
code/branches/core6/src/modules/objects/triggers/DistanceTrigger.h
r8706 r9629 97 97 { 98 98 public: 99 DistanceTrigger( BaseObject* creator); // Constructor. Registers and initializes the object.99 DistanceTrigger(Context* context); // Constructor. Registers and initializes the object. 100 100 virtual ~DistanceTrigger(); 101 101 -
code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.cc
r7601 r9629 48 48 The creator of this object. 49 49 */ 50 DistanceTriggerBeacon::DistanceTriggerBeacon( BaseObject* creator) : StaticEntity(creator)50 DistanceTriggerBeacon::DistanceTriggerBeacon(Context* context) : StaticEntity(context) 51 51 { 52 52 RegisterObject(DistanceTriggerBeacon); -
code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.h
r7601 r9629 57 57 58 58 public: 59 DistanceTriggerBeacon( BaseObject* creator); //!< Constructor.59 DistanceTriggerBeacon(Context* context); //!< Constructor. 60 60 virtual ~DistanceTriggerBeacon() {} //!< Destructor. 61 61 -
code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.cc
r7601 r9629 49 49 Constructor. Registers the object. 50 50 */ 51 EventMultiTrigger::EventMultiTrigger( BaseObject* creator) : MultiTrigger(creator)51 EventMultiTrigger::EventMultiTrigger(Context* context) : MultiTrigger(context) 52 52 { 53 53 RegisterObject(EventMultiTrigger); -
code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.h
r8213 r9629 73 73 74 74 public: 75 EventMultiTrigger( BaseObject* creator); //!< Constructor. Registers the object.75 EventMultiTrigger(Context* context); //!< Constructor. Registers the object. 76 76 virtual ~EventMultiTrigger(); //!< Destructor. 77 77 -
code/branches/core6/src/modules/objects/triggers/EventTrigger.cc
r8213 r9629 48 48 The creator of the EventTrigger. 49 49 */ 50 EventTrigger::EventTrigger( BaseObject* creator) : Trigger(creator)50 EventTrigger::EventTrigger(Context* context) : Trigger(context) 51 51 { 52 52 RegisterObject(EventTrigger); -
code/branches/core6/src/modules/objects/triggers/EventTrigger.h
r8706 r9629 70 70 { 71 71 public: 72 EventTrigger( BaseObject* creator); // Constructor. Registers and initializes the object.72 EventTrigger(Context* context); // Constructor. Registers and initializes the object. 73 73 virtual ~EventTrigger(); 74 74 -
code/branches/core6/src/modules/objects/triggers/MultiTrigger.cc
r8858 r9629 51 51 The creator. 52 52 */ 53 MultiTrigger::MultiTrigger( BaseObject* creator) : TriggerBase(creator)53 MultiTrigger::MultiTrigger(Context* context) : TriggerBase(context) 54 54 { 55 55 RegisterObject(MultiTrigger); … … 451 451 } 452 452 453 MultiTriggerContainer* container = new MultiTriggerContainer(this , this, originator);453 MultiTriggerContainer* container = new MultiTriggerContainer(this->getContext(), this, originator); 454 454 this->fireEvent(status, container); 455 455 orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << endl; -
code/branches/core6/src/modules/objects/triggers/MultiTrigger.h
r9016 r9629 99 99 { 100 100 public: 101 MultiTrigger( BaseObject* creator); //!< Constructor. Registers the objects and initializes default values.101 MultiTrigger(Context* context); //!< Constructor. Registers the objects and initializes default values. 102 102 virtual ~MultiTrigger(); //!< Destructor. 103 103 -
code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.cc
r8706 r9629 50 50 The creator. 51 51 */ 52 MultiTriggerContainer::MultiTriggerContainer( BaseObject* creator) : BaseObject(creator), originator_(NULL), data_(NULL)52 MultiTriggerContainer::MultiTriggerContainer(Context* context) : BaseObject(context), originator_(NULL), data_(NULL) 53 53 { 54 54 RegisterObject(MultiTriggerContainer); … … 65 65 A pointer to the data that should be sent with the container. 66 66 */ 67 MultiTriggerContainer::MultiTriggerContainer( BaseObject* creator, MultiTrigger* originator, BaseObject* data) : BaseObject(creator), originator_(originator), data_(data)67 MultiTriggerContainer::MultiTriggerContainer(Context* context, MultiTrigger* originator, BaseObject* data) : BaseObject(context), originator_(originator), data_(data) 68 68 { 69 69 RegisterObject(MultiTriggerContainer); -
code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.h
r7601 r9629 58 58 59 59 public: 60 MultiTriggerContainer( BaseObject* creator); //!< Default constructor. Registers the object and creates an empty container.61 MultiTriggerContainer( BaseObject* creator, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values.60 MultiTriggerContainer(Context* context); //!< Default constructor. Registers the object and creates an empty container. 61 MultiTriggerContainer(Context* context, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values. 62 62 virtual ~MultiTriggerContainer(); //!< Destructor. 63 63 -
code/branches/core6/src/modules/objects/triggers/Trigger.cc
r8706 r9629 55 55 The creator of the Trigger. 56 56 */ 57 Trigger::Trigger( BaseObject* creator) : TriggerBase(creator)57 Trigger::Trigger(Context* context) : TriggerBase(context) 58 58 { 59 59 RegisterObject(Trigger); -
code/branches/core6/src/modules/objects/triggers/Trigger.h
r8213 r9629 80 80 { 81 81 public: 82 Trigger( BaseObject* creator); // Constructor. Registers and initializes the object.82 Trigger(Context* context); // Constructor. Registers and initializes the object. 83 83 virtual ~Trigger(); 84 84 -
code/branches/core6/src/modules/objects/triggers/TriggerBase.cc
r8858 r9629 52 52 Constructor. Registers the object and initializes some values. 53 53 */ 54 TriggerBase::TriggerBase( BaseObject* creator) : StaticEntity(creator)54 TriggerBase::TriggerBase(Context* context) : StaticEntity(context) 55 55 { 56 56 RegisterObject(TriggerBase); -
code/branches/core6/src/modules/objects/triggers/TriggerBase.h
r8706 r9629 74 74 { 75 75 public: 76 TriggerBase( BaseObject* creator);76 TriggerBase(Context* context); 77 77 virtual ~TriggerBase(); 78 78 -
code/branches/core6/src/modules/overlays/FadeoutText.cc
r5929 r9629 38 38 CreateFactory(FadeoutText); 39 39 40 FadeoutText::FadeoutText( BaseObject* creator) : OverlayText(creator)40 FadeoutText::FadeoutText(Context* context) : OverlayText(context) 41 41 { 42 42 RegisterObject(FadeoutText); -
code/branches/core6/src/modules/overlays/FadeoutText.h
r7401 r9629 41 41 { 42 42 public: 43 FadeoutText( BaseObject* creator);43 FadeoutText(Context* context); 44 44 virtual ~FadeoutText() {} 45 45 -
code/branches/core6/src/modules/overlays/GUIOverlay.cc
r8858 r9629 43 43 CreateFactory(GUIOverlay); 44 44 45 GUIOverlay::GUIOverlay( BaseObject* creator) : OrxonoxOverlay(creator)45 GUIOverlay::GUIOverlay(Context* context) : OrxonoxOverlay(context) 46 46 { 47 47 RegisterObject(GUIOverlay); -
code/branches/core6/src/modules/overlays/GUIOverlay.h
r7401 r9629 41 41 public: 42 42 43 GUIOverlay( BaseObject* creator);43 GUIOverlay(Context* context); 44 44 virtual ~GUIOverlay(); 45 45 -
code/branches/core6/src/modules/overlays/OverlayText.cc
r7401 r9629 47 47 BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Right == (int)OverlayText::Right); 48 48 49 OverlayText::OverlayText( BaseObject* creator)50 : OrxonoxOverlay(c reator)49 OverlayText::OverlayText(Context* context) 50 : OrxonoxOverlay(context) 51 51 { 52 52 RegisterObject(OverlayText); -
code/branches/core6/src/modules/overlays/OverlayText.h
r7401 r9629 49 49 }; 50 50 51 OverlayText( BaseObject* creator);51 OverlayText(Context* context); 52 52 virtual ~OverlayText(); 53 53 -
code/branches/core6/src/modules/overlays/debugging/DebugFPSText.cc
r5781 r9629 37 37 CreateFactory(DebugFPSText); 38 38 39 DebugFPSText::DebugFPSText( BaseObject* creator) : OverlayText(creator)39 DebugFPSText::DebugFPSText(Context* context) : OverlayText(context) 40 40 { 41 41 RegisterObject(DebugFPSText); -
code/branches/core6/src/modules/overlays/debugging/DebugFPSText.h
r5781 r9629 40 40 { 41 41 public: 42 DebugFPSText( BaseObject* creator);42 DebugFPSText(Context* context); 43 43 virtual ~DebugFPSText(); 44 44 -
code/branches/core6/src/modules/overlays/debugging/DebugRTRText.cc
r5781 r9629 37 37 CreateFactory(DebugRTRText); 38 38 39 DebugRTRText::DebugRTRText( BaseObject* creator) : OverlayText(creator)39 DebugRTRText::DebugRTRText(Context* context) : OverlayText(context) 40 40 { 41 41 RegisterObject(DebugRTRText); -
code/branches/core6/src/modules/overlays/debugging/DebugRTRText.h
r5781 r9629 40 40 { 41 41 public: 42 DebugRTRText( BaseObject* creator);42 DebugRTRText(Context* context); 43 43 virtual ~DebugRTRText(); 44 44 -
code/branches/core6/src/modules/overlays/hud/AnnounceMessage.cc
r5781 r9629 36 36 CreateFactory(AnnounceMessage); 37 37 38 AnnounceMessage::AnnounceMessage( BaseObject* creator) : FadeoutText(creator)38 AnnounceMessage::AnnounceMessage(Context* context) : FadeoutText(context) 39 39 { 40 40 RegisterObject(AnnounceMessage); -
code/branches/core6/src/modules/overlays/hud/AnnounceMessage.h
r5781 r9629 40 40 { 41 41 public: 42 AnnounceMessage( BaseObject* creator);42 AnnounceMessage(Context* context); 43 43 virtual ~AnnounceMessage() {} 44 44 -
code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc
r9558 r9629 46 46 CreateFactory(ChatOverlay); 47 47 48 ChatOverlay::ChatOverlay( BaseObject* creator)49 : OverlayText(c reator)48 ChatOverlay::ChatOverlay(Context* context) 49 : OverlayText(context) 50 50 { 51 51 RegisterObject(ChatOverlay); -
code/branches/core6/src/modules/overlays/hud/ChatOverlay.h
r8858 r9629 43 43 { 44 44 public: 45 ChatOverlay( BaseObject* creator);45 ChatOverlay(Context* context); 46 46 virtual ~ChatOverlay(); 47 47 -
code/branches/core6/src/modules/overlays/hud/DeathMessage.cc
r5781 r9629 36 36 CreateFactory(DeathMessage); 37 37 38 DeathMessage::DeathMessage( BaseObject* creator) : FadeoutText(creator)38 DeathMessage::DeathMessage(Context* context) : FadeoutText(context) 39 39 { 40 40 RegisterObject(DeathMessage); -
code/branches/core6/src/modules/overlays/hud/DeathMessage.h
r5781 r9629 40 40 { 41 41 public: 42 DeathMessage( BaseObject* creator);42 DeathMessage(Context* context); 43 43 virtual ~DeathMessage() {} 44 44 -
code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.cc
r7163 r9629 36 36 CreateFactory(GametypeFadingMessage); 37 37 38 GametypeFadingMessage::GametypeFadingMessage( BaseObject* creator) : FadeoutText(creator)38 GametypeFadingMessage::GametypeFadingMessage(Context* context) : FadeoutText(context) 39 39 { 40 40 RegisterObject(GametypeFadingMessage); -
code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.h
r8729 r9629 40 40 { 41 41 public: 42 GametypeFadingMessage( BaseObject* creator);42 GametypeFadingMessage(Context* context); 43 43 virtual ~GametypeFadingMessage(); 44 44 -
code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.cc
r7163 r9629 39 39 40 40 41 GametypeStaticMessage::GametypeStaticMessage( BaseObject* creator) : OverlayText(creator)41 GametypeStaticMessage::GametypeStaticMessage(Context* context) : OverlayText(context) 42 42 { 43 43 RegisterObject(GametypeStaticMessage); -
code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.h
r7163 r9629 43 43 { 44 44 public: 45 GametypeStaticMessage( BaseObject* creator);45 GametypeStaticMessage(Context* context); 46 46 virtual ~GametypeStaticMessage(); 47 47 -
code/branches/core6/src/modules/overlays/hud/HUDBar.cc
r8706 r9629 47 47 CreateFactory(BarColour); 48 48 49 BarColour::BarColour( BaseObject* creator)50 : BaseObject(c reator)49 BarColour::BarColour(Context* context) 50 : BaseObject(context) 51 51 { 52 52 RegisterObject(BarColour); … … 67 67 unsigned int HUDBar::materialcount_s = 0; 68 68 69 HUDBar::HUDBar( BaseObject* creator)70 : OrxonoxOverlay(c reator), right2Left_(false), autoColour_(false)69 HUDBar::HUDBar(Context* context) 70 : OrxonoxOverlay(context), right2Left_(false), autoColour_(false) 71 71 { 72 72 RegisterObject(HUDBar); -
code/branches/core6/src/modules/overlays/hud/HUDBar.h
r8706 r9629 48 48 { 49 49 public: 50 BarColour( BaseObject* creator);50 BarColour(Context* context); 51 51 virtual ~BarColour() { } 52 52 … … 68 68 { 69 69 public: 70 HUDBar( BaseObject* creator);70 HUDBar(Context* context); 71 71 virtual ~HUDBar(); 72 72 -
code/branches/core6/src/modules/overlays/hud/HUDBoostBar.cc
r9348 r9629 37 37 CreateFactory(HUDBoostBar); 38 38 39 HUDBoostBar::HUDBoostBar( BaseObject* creator)40 : HUDBar(c reator)39 HUDBoostBar::HUDBoostBar(Context* context) 40 : HUDBar(context) 41 41 { 42 42 RegisterObject(HUDBoostBar); -
code/branches/core6/src/modules/overlays/hud/HUDBoostBar.h
r9348 r9629 40 40 { 41 41 public: 42 HUDBoostBar( BaseObject* creator);42 HUDBoostBar(Context* context); 43 43 virtual ~HUDBoostBar(); 44 44 -
code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc
r9558 r9629 36 36 CreateFactory(HUDEnemyHealthBar); 37 37 38 HUDEnemyHealthBar::HUDEnemyHealthBar( BaseObject* creator) : HUDHealthBar(creator)38 HUDEnemyHealthBar::HUDEnemyHealthBar(Context* context) : HUDHealthBar(context) 39 39 { 40 40 RegisterObject(HUDEnemyHealthBar); -
code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.h
r9348 r9629 37 37 { 38 38 public: 39 HUDEnemyHealthBar( BaseObject* creator);39 HUDEnemyHealthBar(Context* context); 40 40 virtual ~HUDEnemyHealthBar(); 41 41 -
code/branches/core6/src/modules/overlays/hud/HUDHealthBar.cc
r6054 r9629 39 39 CreateFactory(HUDHealthBar); 40 40 41 HUDHealthBar::HUDHealthBar( BaseObject* creator) : HUDBar(creator)41 HUDHealthBar::HUDHealthBar(Context* context) : HUDBar(context) 42 42 { 43 43 RegisterObject(HUDHealthBar); … … 46 46 this->bUseBarColour_ = false; 47 47 48 this->textoverlay_ = new OverlayText(this );48 this->textoverlay_ = new OverlayText(this->getContext()); 49 49 50 50 assert(this->textoverlay_.get()); -
code/branches/core6/src/modules/overlays/hud/HUDHealthBar.h
r9259 r9629 42 42 { 43 43 public: 44 HUDHealthBar( BaseObject* creator);44 HUDHealthBar(Context* context); 45 45 virtual ~HUDHealthBar(); 46 46 -
code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc
r9558 r9629 71 71 HUDNavigation* HUDNavigation::localHUD_s = 0; 72 72 73 HUDNavigation::HUDNavigation( BaseObject* creator) :74 OrxonoxOverlay(c reator)73 HUDNavigation::HUDNavigation(Context* context) : 74 OrxonoxOverlay(context) 75 75 { 76 76 RegisterObject(HUDNavigation) -
code/branches/core6/src/modules/overlays/hud/HUDNavigation.h
r9526 r9629 46 46 { 47 47 public: 48 HUDNavigation( BaseObject* creator);48 HUDNavigation(Context* context); 49 49 virtual ~HUDNavigation(); 50 50 -
code/branches/core6/src/modules/overlays/hud/HUDRadar.cc
r9348 r9629 46 46 CreateFactory(HUDRadar); 47 47 48 HUDRadar::HUDRadar( BaseObject* creator)49 : OrxonoxOverlay(c reator)48 HUDRadar::HUDRadar(Context* context) 49 : OrxonoxOverlay(context) 50 50 { 51 51 RegisterObject(HUDRadar); -
code/branches/core6/src/modules/overlays/hud/HUDRadar.h
r8891 r9629 46 46 { 47 47 public: 48 HUDRadar( BaseObject* creator);48 HUDRadar(Context* context); 49 49 virtual ~HUDRadar(); 50 50 -
code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.cc
r8706 r9629 38 38 CreateFactory(HUDSpeedBar); 39 39 40 HUDSpeedBar::HUDSpeedBar( BaseObject* creator)41 : HUDBar(c reator)40 HUDSpeedBar::HUDSpeedBar(Context* context) 41 : HUDBar(context) 42 42 { 43 43 RegisterObject(HUDSpeedBar); -
code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.h
r5781 r9629 41 41 { 42 42 public: 43 HUDSpeedBar( BaseObject* creator);43 HUDSpeedBar(Context* context); 44 44 virtual ~HUDSpeedBar(); 45 45 -
code/branches/core6/src/modules/overlays/hud/HUDTimer.cc
r5781 r9629 38 38 CreateFactory(HUDTimer); 39 39 40 HUDTimer::HUDTimer( BaseObject* creator) : OverlayText(creator)40 HUDTimer::HUDTimer(Context* context) : OverlayText(context) 41 41 { 42 42 RegisterObject(HUDTimer); -
code/branches/core6/src/modules/overlays/hud/HUDTimer.h
r5781 r9629 40 40 { 41 41 public: 42 HUDTimer( BaseObject* creator);42 HUDTimer(Context* context); 43 43 virtual ~HUDTimer(); 44 44 -
code/branches/core6/src/modules/overlays/hud/KillMessage.cc
r5781 r9629 36 36 CreateFactory(KillMessage); 37 37 38 KillMessage::KillMessage( BaseObject* creator) : FadeoutText(creator)38 KillMessage::KillMessage(Context* context) : FadeoutText(context) 39 39 { 40 40 RegisterObject(KillMessage); -
code/branches/core6/src/modules/overlays/hud/KillMessage.h
r5781 r9629 40 40 { 41 41 public: 42 KillMessage( BaseObject* creator);42 KillMessage(Context* context); 43 43 virtual ~KillMessage() {} 44 44 -
code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.cc
r7655 r9629 39 39 CreateFactory(LastManStandingInfos); 40 40 41 LastManStandingInfos::LastManStandingInfos( BaseObject* creator) : OverlayText(creator)41 LastManStandingInfos::LastManStandingInfos(Context* context) : OverlayText(context) 42 42 { 43 43 RegisterObject(LastManStandingInfos); -
code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.h
r7655 r9629 40 40 { 41 41 public: 42 LastManStandingInfos( BaseObject* creator);42 LastManStandingInfos(Context* context); 43 43 virtual ~LastManStandingInfos(); 44 44 -
code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.cc
r8351 r9629 39 39 CreateFactory(LastTeamStandingInfos); 40 40 41 LastTeamStandingInfos::LastTeamStandingInfos( BaseObject* creator) : OverlayText(creator)41 LastTeamStandingInfos::LastTeamStandingInfos(Context* context) : OverlayText(context) 42 42 { 43 43 RegisterObject(LastTeamStandingInfos); -
code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.h
r8178 r9629 40 40 { 41 41 public: 42 LastTeamStandingInfos( BaseObject* creator);42 LastTeamStandingInfos(Context* context); 43 43 virtual ~LastTeamStandingInfos(); 44 44 -
code/branches/core6/src/modules/overlays/hud/PauseNotice.cc
r8079 r9629 36 36 CreateFactory(PauseNotice); 37 37 38 PauseNotice::PauseNotice( BaseObject* creator) : OverlayText(creator)38 PauseNotice::PauseNotice(Context* context) : OverlayText(context) 39 39 { 40 40 RegisterObject(PauseNotice); -
code/branches/core6/src/modules/overlays/hud/PauseNotice.h
r8079 r9629 40 40 { 41 41 public: 42 PauseNotice( BaseObject* creator);42 PauseNotice(Context* context); 43 43 44 44 virtual void changedOwner(); -
code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.cc
r6417 r9629 39 39 CreateFactory(TeamBaseMatchScore); 40 40 41 TeamBaseMatchScore::TeamBaseMatchScore( BaseObject* creator) : OverlayText(creator)41 TeamBaseMatchScore::TeamBaseMatchScore(Context* context) : OverlayText(context) 42 42 { 43 43 RegisterObject(TeamBaseMatchScore); -
code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.h
r5781 r9629 40 40 { 41 41 public: 42 TeamBaseMatchScore( BaseObject* creator);42 TeamBaseMatchScore(Context* context); 43 43 virtual ~TeamBaseMatchScore(); 44 44 -
code/branches/core6/src/modules/overlays/stats/Scoreboard.cc
r7401 r9629 40 40 @brief Constructor: Creates the scoreboard. 41 41 */ 42 Scoreboard::Scoreboard( BaseObject* creator)43 : OrxonoxOverlay(c reator)42 Scoreboard::Scoreboard(Context* context) 43 : OrxonoxOverlay(context) 44 44 { 45 45 RegisterObject(Scoreboard); -
code/branches/core6/src/modules/overlays/stats/Scoreboard.h
r7401 r9629 41 41 { 42 42 public: // functions 43 Scoreboard( BaseObject* creator);43 Scoreboard(Context* context); 44 44 virtual ~Scoreboard(); 45 45 -
code/branches/core6/src/modules/overlays/stats/Stats.cc
r9558 r9629 44 44 @brief Constructor: Creates and initializes the Stats panel. 45 45 */ 46 Stats::Stats( BaseObject* creator)47 : OrxonoxOverlay(c reator)46 Stats::Stats(Context* context) 47 : OrxonoxOverlay(context) 48 48 , statsOverlayNoise_(0) 49 49 , statsOverlayBorder_(0) -
code/branches/core6/src/modules/overlays/stats/Stats.h
r7401 r9629 41 41 { 42 42 public: // functions 43 Stats( BaseObject* creator);43 Stats(Context* context); 44 44 virtual ~Stats(); 45 45 -
code/branches/core6/src/modules/pickup/Pickup.cc
r9348 r9629 56 56 The objects creator. 57 57 */ 58 Pickup::Pickup( BaseObject* creator) : BaseObject(creator)58 Pickup::Pickup(Context* context) : BaseObject(context) 59 59 { 60 60 RegisterObject(Pickup); … … 187 187 bool Pickup::createSpawner(void) 188 188 { 189 PickupSpawner::createDroppedPickup(this , this, this->getCarrier());189 PickupSpawner::createDroppedPickup(this->getContext(), this, this->getCarrier()); 190 190 return true; 191 191 } -
code/branches/core6/src/modules/pickup/Pickup.h
r9348 r9629 100 100 101 101 public: 102 Pickup( BaseObject* creator); //!< Constructor.102 Pickup(Context* context); //!< Constructor. 103 103 virtual ~Pickup(); //!< Destructor. 104 104 -
code/branches/core6/src/modules/pickup/PickupCollection.cc
r9348 r9629 53 53 The creator of the object. 54 54 */ 55 PickupCollection::PickupCollection( BaseObject* creator) : BaseObject(creator)55 PickupCollection::PickupCollection(Context* context) : BaseObject(context) 56 56 { 57 57 RegisterObject(PickupCollection); … … 328 328 bool PickupCollection::createSpawner(void) 329 329 { 330 PickupSpawner::createDroppedPickup(this , this, this->getCarrier());330 PickupSpawner::createDroppedPickup(this->getContext(), this, this->getCarrier()); 331 331 return true; 332 332 } -
code/branches/core6/src/modules/pickup/PickupCollection.h
r9348 r9629 70 70 71 71 public: 72 PickupCollection( BaseObject* creator); //!< Default Constructor.72 PickupCollection(Context* context); //!< Default Constructor. 73 73 virtual ~PickupCollection(); //!< Destructor. 74 74 -
code/branches/core6/src/modules/pickup/PickupRepresentation.cc
r9348 r9629 64 64 Default Constructor. Registers the object and initializes its member variables. 65 65 */ 66 PickupRepresentation::PickupRepresentation( BaseObject* creator) : BaseObject(creator), Synchronisable(creator), spawnerRepresentation_(NULL)66 PickupRepresentation::PickupRepresentation(Context* context) : BaseObject(context), Synchronisable(context), spawnerRepresentation_(NULL) 67 67 { 68 68 RegisterObject(PickupRepresentation); … … 180 180 StaticEntity* PickupRepresentation::getDefaultSpawnerRepresentation(PickupSpawner* spawner) 181 181 { 182 StaticEntity* representation = new StaticEntity(spawner );183 Billboard* sphere = new Billboard(spawner );182 StaticEntity* representation = new StaticEntity(spawner->getContext()); 183 Billboard* sphere = new Billboard(spawner->getContext()); 184 184 sphere->setColour(ColourValue(0.95f, 0.85f, 0.27f)); 185 185 sphere->setMaterial("Sphere2"); 186 186 sphere->setScale(0.1f); 187 Billboard* icon = new Billboard(spawner );187 Billboard* icon = new Billboard(spawner->getContext()); 188 188 icon->setColour(ColourValue(0.89f, 0.79f, 0.08f)); 189 189 icon->setMaterial("asterisk"); -
code/branches/core6/src/modules/pickup/PickupRepresentation.h
r9348 r9629 95 95 public: 96 96 PickupRepresentation(); //!< Constructor 97 PickupRepresentation( BaseObject* creator); //!< Default constructor.97 PickupRepresentation(Context* context); //!< Default constructor. 98 98 virtual ~PickupRepresentation(); //!< Destructor. 99 99 -
code/branches/core6/src/modules/pickup/PickupSpawner.cc
r9348 r9629 55 55 Pointer to the object which created this item. 56 56 */ 57 PickupSpawner::PickupSpawner( BaseObject* creator) : StaticEntity(creator), pickup_(NULL), representation_(NULL), pickupTemplate_(NULL)57 PickupSpawner::PickupSpawner(Context* context) : StaticEntity(context), pickup_(NULL), representation_(NULL), pickupTemplate_(NULL) 58 58 { 59 59 RegisterObject(PickupSpawner); … … 99 99 The distance at which the PickupSpawner will trigger. 100 100 */ 101 /*static*/ PickupSpawner* PickupSpawner::createDroppedPickup( BaseObject* creator, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance)102 { 103 PickupSpawner* spawner = new PickupSpawner(c reator);101 /*static*/ PickupSpawner* PickupSpawner::createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance) 102 { 103 PickupSpawner* spawner = new PickupSpawner(context); 104 104 105 105 spawner->setPickupable(pickup); … … 289 289 if (identifier != NULL) 290 290 { 291 Pickupable* pickup = orxonox_cast<Pickupable*>(identifier->fabricate(this ));291 Pickupable* pickup = orxonox_cast<Pickupable*>(identifier->fabricate(this->getContext())); 292 292 orxonox_cast<BaseObject*>(pickup)->addTemplate(this->pickupTemplate_); 293 293 return pickup; -
code/branches/core6/src/modules/pickup/PickupSpawner.h
r9348 r9629 77 77 { 78 78 public: 79 PickupSpawner( BaseObject* creator); //!< Default Constructor.79 PickupSpawner(Context* context); //!< Default Constructor. 80 80 virtual ~PickupSpawner(); //!< Destructor. 81 81 82 static PickupSpawner* createDroppedPickup( BaseObject* creator, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance = 10.0);82 static PickupSpawner* createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance = 10.0); 83 83 84 84 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PickupSpawner through XML. -
code/branches/core6/src/modules/pickup/items/DamageBoostPickup.cc
r9348 r9629 48 48 Constructor. Registers the object and initializes the member variables. 49 49 */ 50 DamageBoostPickup::DamageBoostPickup( BaseObject* creator) : Pickup(creator)50 DamageBoostPickup::DamageBoostPickup(Context* context) : Pickup(context) 51 51 { 52 52 RegisterObject(DamageBoostPickup); -
code/branches/core6/src/modules/pickup/items/DamageBoostPickup.h
r9348 r9629 49 49 public: 50 50 51 DamageBoostPickup( BaseObject* creator); //!< Constructor.51 DamageBoostPickup(Context* context); //!< Constructor. 52 52 virtual ~DamageBoostPickup(); //!< Destructor. 53 53 -
code/branches/core6/src/modules/pickup/items/DronePickup.cc
r9348 r9629 51 51 Constructor. Registers the object and initializes the member variables. 52 52 */ 53 DronePickup::DronePickup( BaseObject* creator) : Pickup(creator)53 DronePickup::DronePickup(Context* context) : Pickup(context) 54 54 { 55 55 RegisterObject(DronePickup); … … 126 126 127 127 //Attach to pawn 128 Drone* drone = new Drone(pawn->getC reator()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)128 Drone* drone = new Drone(pawn->getContext()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something) 129 129 drone->addTemplate(this->getDroneTemplate()); 130 130 -
code/branches/core6/src/modules/pickup/items/DronePickup.h
r9348 r9629 64 64 public: 65 65 66 DronePickup( BaseObject* creator); //!< Constructor.66 DronePickup(Context* context); //!< Constructor. 67 67 virtual ~DronePickup(); //!< Destructor. 68 68 -
code/branches/core6/src/modules/pickup/items/HealthPickup.cc
r9348 r9629 53 53 Constructor. Registers the object and initializes the member variables. 54 54 */ 55 HealthPickup::HealthPickup( BaseObject* creator) : Pickup(creator)55 HealthPickup::HealthPickup(Context* context) : Pickup(context) 56 56 { 57 57 RegisterObject(HealthPickup); -
code/branches/core6/src/modules/pickup/items/HealthPickup.h
r9348 r9629 90 90 public: 91 91 92 HealthPickup( BaseObject* creator); //!< Constructor.92 HealthPickup(Context* context); //!< Constructor. 93 93 virtual ~HealthPickup(); //!< Destructor. 94 94 -
code/branches/core6/src/modules/pickup/items/InvisiblePickup.cc
r9348 r9629 51 51 Constructor. Registers the object and initializes the member variables. 52 52 */ 53 InvisiblePickup::InvisiblePickup( BaseObject* creator) : Pickup(creator)53 InvisiblePickup::InvisiblePickup(Context* context) : Pickup(context) 54 54 { 55 55 RegisterObject(InvisiblePickup); -
code/branches/core6/src/modules/pickup/items/InvisiblePickup.h
r9348 r9629 70 70 public: 71 71 72 InvisiblePickup( BaseObject* creator); //!< Constructor.72 InvisiblePickup(Context* context); //!< Constructor. 73 73 virtual ~InvisiblePickup(); //!< Destructor. 74 74 -
code/branches/core6/src/modules/pickup/items/MetaPickup.cc
r9348 r9629 55 55 Constructor. Registers and initializes the object. 56 56 */ 57 MetaPickup::MetaPickup( BaseObject* creator) : Pickup(creator)57 MetaPickup::MetaPickup(Context* context) : Pickup(context) 58 58 { 59 59 RegisterObject(MetaPickup); -
code/branches/core6/src/modules/pickup/items/MetaPickup.h
r9348 r9629 89 89 90 90 public: 91 MetaPickup( BaseObject* creator); //!< Constructor. Registers and initializes the object.91 MetaPickup(Context* context); //!< Constructor. Registers and initializes the object. 92 92 virtual ~MetaPickup(); //!< Destructor. 93 93 -
code/branches/core6/src/modules/pickup/items/ShieldPickup.cc
r9348 r9629 48 48 Constructor. Registers the object and initializes the member variables. 49 49 */ 50 ShieldPickup::ShieldPickup( BaseObject* creator) : Pickup(creator)50 ShieldPickup::ShieldPickup(Context* context) : Pickup(context) 51 51 { 52 52 RegisterObject(ShieldPickup); -
code/branches/core6/src/modules/pickup/items/ShieldPickup.h
r9348 r9629 76 76 public: 77 77 78 ShieldPickup( BaseObject* creator); //!< Constructor.78 ShieldPickup(Context* context); //!< Constructor. 79 79 virtual ~ShieldPickup(); //!< Destructor. 80 80 -
code/branches/core6/src/modules/pickup/items/ShrinkPickup.cc
r9348 r9629 52 52 Constructor: Initializes the Pickup. 53 53 */ 54 ShrinkPickup::ShrinkPickup( BaseObject* creator) : Pickup(creator)54 ShrinkPickup::ShrinkPickup(Context* context) : Pickup(context) 55 55 { 56 56 RegisterObject(ShrinkPickup); -
code/branches/core6/src/modules/pickup/items/ShrinkPickup.h
r9348 r9629 72 72 { 73 73 public: 74 ShrinkPickup( BaseObject* creator); // Constructor.74 ShrinkPickup(Context* context); // Constructor. 75 75 virtual ~ShrinkPickup(); // Destructor. 76 76 -
code/branches/core6/src/modules/pickup/items/SpeedPickup.cc
r9348 r9629 48 48 Constructor. Registers the object and initializes the member variables. 49 49 */ 50 SpeedPickup::SpeedPickup( BaseObject* creator) : Pickup(creator)50 SpeedPickup::SpeedPickup(Context* context) : Pickup(context) 51 51 { 52 52 RegisterObject(SpeedPickup); -
code/branches/core6/src/modules/pickup/items/SpeedPickup.h
r9348 r9629 75 75 public: 76 76 77 SpeedPickup( BaseObject* creator); //!< Constructor.77 SpeedPickup(Context* context); //!< Constructor. 78 78 virtual ~SpeedPickup(); //!< Destructor. 79 79 -
code/branches/core6/src/modules/pong/Pong.cc
r9558 r9629 59 59 Constructor. Registers and initializes the object. 60 60 */ 61 Pong::Pong( BaseObject* creator) : Deathmatch(creator)61 Pong::Pong(Context* context) : Deathmatch(context) 62 62 { 63 63 RegisterObject(Pong); … … 129 129 if (this->ball_ == NULL) // If there is no ball, create a new ball. 130 130 { 131 this->ball_ = new PongBall(this->center_ );131 this->ball_ = new PongBall(this->center_->getContext()); 132 132 // Apply the template for the ball specified by the centerpoint. 133 133 this->ball_->addTemplate(this->center_->getBalltemplate()); … … 147 147 if (this->bat_[i] == NULL) 148 148 { 149 this->bat_[i] = new PongBat(this->center_ );149 this->bat_[i] = new PongBat(this->center_->getContext()); 150 150 this->bat_[i]->addTemplate(this->center_->getBattemplate()); 151 151 } -
code/branches/core6/src/modules/pong/Pong.h
r9348 r9629 65 65 { 66 66 public: 67 Pong( BaseObject* creator); //!< Constructor. Registers and initializes the object.67 Pong(Context* context); //!< Constructor. Registers and initializes the object. 68 68 virtual ~Pong(); //!< Destructor. Cleans up, if initialized. 69 69 -
code/branches/core6/src/modules/pong/PongAI.cc
r9558 r9629 53 53 Constructor. Registers and initializes the object. 54 54 */ 55 PongAI::PongAI( BaseObject* creator) : Controller(creator)55 PongAI::PongAI(Context* context) : Controller(context) 56 56 { 57 57 RegisterObject(PongAI); -
code/branches/core6/src/modules/pong/PongAI.h
r9579 r9629 61 61 { 62 62 public: 63 PongAI( BaseObject* creator); //!< Constructor. Registers and initializes the object.63 PongAI(Context* context); //!< Constructor. Registers and initializes the object. 64 64 virtual ~PongAI(); 65 65 -
code/branches/core6/src/modules/pong/PongBall.cc
r8108 r9629 51 51 Constructor. Registers and initializes the object. 52 52 */ 53 PongBall::PongBall( BaseObject* creator)54 : MovableEntity(c reator)53 PongBall::PongBall(Context* context) 54 : MovableEntity(context) 55 55 { 56 56 RegisterObject(PongBall); -
code/branches/core6/src/modules/pong/PongBall.h
r8108 r9629 59 59 { 60 60 public: 61 PongBall( BaseObject* creator);61 PongBall(Context* context); 62 62 virtual ~PongBall(); 63 63 -
code/branches/core6/src/modules/pong/PongBat.cc
r8108 r9629 45 45 Constructor. Registers and initializes the object. 46 46 */ 47 PongBat::PongBat( BaseObject* creator) : ControllableEntity(creator)47 PongBat::PongBat(Context* context) : ControllableEntity(context) 48 48 { 49 49 RegisterObject(PongBat); -
code/branches/core6/src/modules/pong/PongBat.h
r8706 r9629 57 57 { 58 58 public: 59 PongBat( BaseObject* creator); //!< Constructor. Registers and initializes the object.59 PongBat(Context* context); //!< Constructor. Registers and initializes the object. 60 60 virtual ~PongBat() {} 61 61 -
code/branches/core6/src/modules/pong/PongBot.cc
r8108 r9629 45 45 Constructor. Registers the object and creates a PongAI controller. 46 46 */ 47 PongBot::PongBot( BaseObject* creator) : Bot(creator)47 PongBot::PongBot(Context* context) : Bot(context) 48 48 { 49 49 RegisterObject(PongBot); -
code/branches/core6/src/modules/pong/PongBot.h
r8108 r9629 56 56 { 57 57 public: 58 PongBot( BaseObject* creator);58 PongBot(Context* context); 59 59 virtual ~PongBot() {} 60 60 }; -
code/branches/core6/src/modules/pong/PongCenterpoint.cc
r8108 r9629 47 47 Constructor. Registers and initializes the object and checks whether the gametype is actually Pong. 48 48 */ 49 PongCenterpoint::PongCenterpoint( BaseObject* creator) : StaticEntity(creator)49 PongCenterpoint::PongCenterpoint(Context* context) : StaticEntity(context) 50 50 { 51 51 RegisterObject(PongCenterpoint); -
code/branches/core6/src/modules/pong/PongCenterpoint.h
r8108 r9629 121 121 { 122 122 public: 123 PongCenterpoint( BaseObject* creator); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Pong.123 PongCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Pong. 124 124 virtual ~PongCenterpoint() {} 125 125 -
code/branches/core6/src/modules/pong/PongScore.cc
r9264 r9629 50 50 Constructor. Registers and initializes the object. 51 51 */ 52 PongScore::PongScore( BaseObject* creator) : OverlayText(creator)52 PongScore::PongScore(Context* context) : OverlayText(context) 53 53 { 54 54 RegisterObject(PongScore); -
code/branches/core6/src/modules/pong/PongScore.h
r9258 r9629 57 57 { 58 58 public: 59 PongScore( BaseObject* creator);59 PongScore(Context* context); 60 60 virtual ~PongScore(); 61 61 -
code/branches/core6/src/modules/portals/PortalEndPoint.cc
r9526 r9629 48 48 std::map<unsigned int, PortalEndPoint *> PortalEndPoint::idMap_s; 49 49 50 PortalEndPoint::PortalEndPoint( BaseObject* creator) : StaticEntity(creator), RadarViewable(creator, static_cast<WorldEntity*>(this)), id_(0), trigger_(NULL), reenterDelay_(0)50 PortalEndPoint::PortalEndPoint(Context* context) : StaticEntity(context), RadarViewable(this, static_cast<WorldEntity*>(this)), id_(0), trigger_(NULL), reenterDelay_(0) 51 51 { 52 52 RegisterObject(PortalEndPoint); 53 53 54 this->trigger_ = new DistanceMultiTrigger(this );54 this->trigger_ = new DistanceMultiTrigger(this->getContext()); 55 55 this->trigger_->setName("portal"); 56 56 this->attach(this->trigger_); … … 61 61 if( GameMode::isMaster() ) 62 62 { 63 this->portalSound_ = new WorldSound(this );63 this->portalSound_ = new WorldSound(this->getContext()); 64 64 this->portalSound_->setLooping(false); 65 65 this->attach(this->portalSound_); -
code/branches/core6/src/modules/portals/PortalEndPoint.h
r9526 r9629 60 60 { 61 61 public: 62 PortalEndPoint( BaseObject* creator);62 PortalEndPoint(Context* context); 63 63 virtual ~PortalEndPoint(); 64 64 -
code/branches/core6/src/modules/portals/PortalLink.cc
r8767 r9629 40 40 std::map<PortalEndPoint *, PortalEndPoint *> PortalLink::links_s; 41 41 42 PortalLink::PortalLink( BaseObject* creator) : BaseObject(creator), fromID_(0), toID_(0), from_(0), to_(0)42 PortalLink::PortalLink(Context* context) : BaseObject(context), fromID_(0), toID_(0), from_(0), to_(0) 43 43 { 44 44 RegisterObject(PortalLink); -
code/branches/core6/src/modules/portals/PortalLink.h
r8767 r9629 54 54 { 55 55 public: 56 PortalLink( BaseObject* creator);56 PortalLink(Context* context); 57 57 virtual ~PortalLink(); 58 58 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); -
code/branches/core6/src/modules/questsystem/GlobalQuest.cc
r8858 r9629 47 47 Constructor. Registers the object. 48 48 */ 49 GlobalQuest::GlobalQuest( BaseObject* creator) : Quest(creator)49 GlobalQuest::GlobalQuest(Context* context) : Quest(context) 50 50 { 51 51 RegisterObject(GlobalQuest); -
code/branches/core6/src/modules/questsystem/GlobalQuest.h
r7552 r9629 90 90 { 91 91 public: 92 GlobalQuest( BaseObject* creator);92 GlobalQuest(Context* context); 93 93 virtual ~GlobalQuest(); 94 94 -
code/branches/core6/src/modules/questsystem/LocalQuest.cc
r8858 r9629 47 47 Constructor. Registers and initializes the object. 48 48 */ 49 LocalQuest::LocalQuest( BaseObject* creator) : Quest(creator)49 LocalQuest::LocalQuest(Context* context) : Quest(context) 50 50 { 51 51 RegisterObject(LocalQuest); -
code/branches/core6/src/modules/questsystem/LocalQuest.h
r7552 r9629 84 84 { 85 85 public: 86 LocalQuest( BaseObject* creator);86 LocalQuest(Context* context); 87 87 virtual ~LocalQuest(); 88 88 -
code/branches/core6/src/modules/questsystem/Quest.cc
r8858 r9629 49 49 Constructor. Registers and initializes object. 50 50 */ 51 Quest::Quest( BaseObject* creator) : QuestItem(creator)51 Quest::Quest(Context* context) : QuestItem(context) 52 52 { 53 53 RegisterObject(Quest); -
code/branches/core6/src/modules/questsystem/Quest.h
r7552 r9629 82 82 { // tolua_export 83 83 public: 84 Quest( BaseObject* creator);84 Quest(Context* context); 85 85 virtual ~Quest(); 86 86 -
code/branches/core6/src/modules/questsystem/QuestDescription.cc
r8858 r9629 52 52 Constructor. Registers and initializes the object. 53 53 */ 54 QuestDescription::QuestDescription( BaseObject* creator) : BaseObject(creator)54 QuestDescription::QuestDescription(Context* context) : BaseObject(context) 55 55 { 56 56 RegisterObject(QuestDescription); -
code/branches/core6/src/modules/questsystem/QuestDescription.h
r7552 r9629 64 64 // tolua_end 65 65 public: 66 QuestDescription( BaseObject* creator);66 QuestDescription(Context* context); 67 67 virtual ~QuestDescription(); 68 68 -
code/branches/core6/src/modules/questsystem/QuestEffect.cc
r8858 r9629 42 42 Is not meant to be invoked directly, since this is only an interface. 43 43 */ 44 QuestEffect::QuestEffect( BaseObject* creator) : BaseObject(creator)44 QuestEffect::QuestEffect(Context* context) : BaseObject(context) 45 45 { 46 46 RegisterObject(QuestEffect); -
code/branches/core6/src/modules/questsystem/QuestEffect.h
r7552 r9629 57 57 { 58 58 public: 59 QuestEffect( BaseObject* creator);59 QuestEffect(Context* context); 60 60 virtual ~QuestEffect(); 61 61 -
code/branches/core6/src/modules/questsystem/QuestEffectBeacon.cc
r8858 r9629 51 51 Constructor. Registers the object and initializes defaults. 52 52 */ 53 QuestEffectBeacon::QuestEffectBeacon( BaseObject* creator) : StaticEntity(creator)53 QuestEffectBeacon::QuestEffectBeacon(Context* context) : StaticEntity(context) 54 54 { 55 55 RegisterObject(QuestEffectBeacon); -
code/branches/core6/src/modules/questsystem/QuestEffectBeacon.h
r7552 r9629 93 93 { 94 94 public: 95 QuestEffectBeacon( BaseObject* creator);95 QuestEffectBeacon(Context* context); 96 96 virtual ~QuestEffectBeacon(); 97 97 -
code/branches/core6/src/modules/questsystem/QuestHint.cc
r8858 r9629 49 49 Constructor. Registers the object. 50 50 */ 51 QuestHint::QuestHint( BaseObject* creator) : QuestItem(creator)51 QuestHint::QuestHint(Context* context) : QuestItem(context) 52 52 { 53 53 RegisterObject(QuestHint); -
code/branches/core6/src/modules/questsystem/QuestHint.h
r7552 r9629 82 82 83 83 public: 84 QuestHint( BaseObject* creator);84 QuestHint(Context* context); 85 85 virtual ~QuestHint(); 86 86 -
code/branches/core6/src/modules/questsystem/QuestItem.cc
r8858 r9629 48 48 Constructor. Registers and initializes the object. 49 49 */ 50 QuestItem::QuestItem( BaseObject* creator) : BaseObject(creator)50 QuestItem::QuestItem(Context* context) : BaseObject(context) 51 51 { 52 52 this->registered_ = false; -
code/branches/core6/src/modules/questsystem/QuestItem.h
r8891 r9629 60 60 61 61 public: 62 QuestItem( BaseObject* creator);62 QuestItem(Context* context); 63 63 virtual ~QuestItem(); 64 64 -
code/branches/core6/src/modules/questsystem/QuestListener.cc
r8858 r9629 54 54 Constructor. Registers the object and initializes variables. 55 55 */ 56 QuestListener::QuestListener( BaseObject* creator) : BaseObject(creator)56 QuestListener::QuestListener(Context* context) : BaseObject(context) 57 57 { 58 58 RegisterObject(QuestListener); -
code/branches/core6/src/modules/questsystem/QuestListener.h
r7552 r9629 87 87 88 88 public: 89 QuestListener( BaseObject* creator);89 QuestListener(Context* context); 90 90 virtual ~QuestListener(); 91 91 -
code/branches/core6/src/modules/questsystem/effects/AddQuest.cc
r8858 r9629 49 49 Constructor. Registers the object. 50 50 */ 51 AddQuest::AddQuest( BaseObject* creator) : ChangeQuestStatus(creator)51 AddQuest::AddQuest(Context* context) : ChangeQuestStatus(context) 52 52 { 53 53 RegisterObject(AddQuest); -
code/branches/core6/src/modules/questsystem/effects/AddQuest.h
r7552 r9629 59 59 { 60 60 public: 61 AddQuest( BaseObject* creator);61 AddQuest(Context* context); 62 62 virtual ~AddQuest(); 63 63 -
code/branches/core6/src/modules/questsystem/effects/AddQuestHint.cc
r8858 r9629 50 50 Constructor. Registers the object. 51 51 */ 52 AddQuestHint::AddQuestHint( BaseObject* creator) : QuestEffect(creator)52 AddQuestHint::AddQuestHint(Context* context) : QuestEffect(context) 53 53 { 54 54 RegisterObject(AddQuestHint); -
code/branches/core6/src/modules/questsystem/effects/AddQuestHint.h
r7552 r9629 61 61 { 62 62 public: 63 AddQuestHint( BaseObject* creator);63 AddQuestHint(Context* context); 64 64 virtual ~AddQuestHint(); 65 65 -
code/branches/core6/src/modules/questsystem/effects/AddReward.cc
r8858 r9629 47 47 Constructor. Registers the object. 48 48 */ 49 AddReward::AddReward( BaseObject* creator) : QuestEffect(creator)49 AddReward::AddReward(Context* context) : QuestEffect(context) 50 50 { 51 51 RegisterObject(AddReward); -
code/branches/core6/src/modules/questsystem/effects/AddReward.h
r7552 r9629 65 65 { 66 66 public: 67 AddReward( BaseObject* creator);67 AddReward(Context* context); 68 68 virtual ~AddReward(); 69 69 -
code/branches/core6/src/modules/questsystem/effects/ChangeQuestStatus.cc
r8858 r9629 46 46 Constructor. Registers the object. 47 47 */ 48 ChangeQuestStatus::ChangeQuestStatus( BaseObject* creator) : QuestEffect(creator)48 ChangeQuestStatus::ChangeQuestStatus(Context* context) : QuestEffect(context) 49 49 { 50 50 RegisterObject(ChangeQuestStatus); -
code/branches/core6/src/modules/questsystem/effects/ChangeQuestStatus.h
r7552 r9629 56 56 { 57 57 public: 58 ChangeQuestStatus( BaseObject* creator);58 ChangeQuestStatus(Context* context); 59 59 virtual ~ChangeQuestStatus(); 60 60 -
code/branches/core6/src/modules/questsystem/effects/CompleteQuest.cc
r8858 r9629 48 48 Constructor. Registers the object. 49 49 */ 50 CompleteQuest::CompleteQuest( BaseObject* creator) : ChangeQuestStatus(creator)50 CompleteQuest::CompleteQuest(Context* context) : ChangeQuestStatus(context) 51 51 { 52 52 RegisterObject(CompleteQuest); -
code/branches/core6/src/modules/questsystem/effects/CompleteQuest.h
r7552 r9629 59 59 { 60 60 public: 61 CompleteQuest( BaseObject* creator);61 CompleteQuest(Context* context); 62 62 virtual ~CompleteQuest(); 63 63 -
code/branches/core6/src/modules/questsystem/effects/FailQuest.cc
r8858 r9629 48 48 Constructor. Registers the object. 49 49 */ 50 FailQuest::FailQuest( BaseObject* creator) : ChangeQuestStatus(creator)50 FailQuest::FailQuest(Context* context) : ChangeQuestStatus(context) 51 51 { 52 52 RegisterObject(FailQuest); -
code/branches/core6/src/modules/questsystem/effects/FailQuest.h
r7552 r9629 59 59 { 60 60 public: 61 FailQuest( BaseObject* creator);61 FailQuest(Context* context); 62 62 virtual ~FailQuest(); 63 63 -
code/branches/core6/src/modules/tetris/Tetris.cc
r9348 r9629 61 61 @ingroup Tetris 62 62 */ 63 Tetris::Tetris( BaseObject* creator) : Deathmatch(creator)63 Tetris::Tetris(Context* context) : Deathmatch(context) 64 64 { 65 65 RegisterObject(Tetris); … … 379 379 { 380 380 // create new futureBrick_ 381 this->futureBrick_ = new TetrisBrick(this->center_ );381 this->futureBrick_ = new TetrisBrick(this->center_->getContext()); 382 382 383 383 -
code/branches/core6/src/modules/tetris/Tetris.h
r9348 r9629 55 55 { 56 56 public: 57 Tetris( BaseObject* creator); //!< Constructor. Registers and initializes the object.57 Tetris(Context* context); //!< Constructor. Registers and initializes the object. 58 58 virtual ~Tetris(); //!< Destructor. Cleans up, if initialized. 59 59 -
code/branches/core6/src/modules/tetris/TetrisBrick.cc
r9348 r9629 51 51 @ingroup Tetris 52 52 */ 53 TetrisBrick::TetrisBrick( BaseObject* creator): ControllableEntity(creator)53 TetrisBrick::TetrisBrick(Context* context): ControllableEntity(context) 54 54 { 55 55 RegisterObject(TetrisBrick); … … 77 77 { 78 78 // Create a new stone and add it to the brick. 79 TetrisStone* stone = new TetrisStone(this );79 TetrisStone* stone = new TetrisStone(this->getContext()); 80 80 this->brickStones_.push_back(stone); 81 81 this->attach(stone); -
code/branches/core6/src/modules/tetris/TetrisBrick.h
r9348 r9629 54 54 { 55 55 public: 56 TetrisBrick( BaseObject* creator); //!< Constructor. Registers and initializes the object.56 TetrisBrick(Context* context); //!< Constructor. Registers and initializes the object. 57 57 virtual ~TetrisBrick() {} 58 58 -
code/branches/core6/src/modules/tetris/TetrisCenterpoint.cc
r9348 r9629 48 48 Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris. 49 49 */ 50 TetrisCenterpoint::TetrisCenterpoint( BaseObject* creator) : StaticEntity(creator)50 TetrisCenterpoint::TetrisCenterpoint(Context* context) : StaticEntity(context) 51 51 { 52 52 RegisterObject(TetrisCenterpoint); -
code/branches/core6/src/modules/tetris/TetrisCenterpoint.h
r9348 r9629 59 59 { 60 60 public: 61 TetrisCenterpoint( BaseObject* creator); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.61 TetrisCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris. 62 62 virtual ~TetrisCenterpoint() {} 63 63 -
code/branches/core6/src/modules/tetris/TetrisScore.cc
r9348 r9629 52 52 @ingroup Tetris 53 53 */ 54 TetrisScore::TetrisScore( BaseObject* creator) : OverlayText(creator)54 TetrisScore::TetrisScore(Context* context) : OverlayText(context) 55 55 { 56 56 RegisterObject(TetrisScore); -
code/branches/core6/src/modules/tetris/TetrisScore.h
r9348 r9629 57 57 { 58 58 public: 59 TetrisScore( BaseObject* creator);59 TetrisScore(Context* context); 60 60 virtual ~TetrisScore(); 61 61 -
code/branches/core6/src/modules/tetris/TetrisStone.cc
r9348 r9629 48 48 Constructor. Registers and initializes the object. 49 49 */ 50 TetrisStone::TetrisStone( BaseObject* creator) : MovableEntity(creator)50 TetrisStone::TetrisStone(Context* context) : MovableEntity(context) 51 51 { 52 52 RegisterObject(TetrisStone); -
code/branches/core6/src/modules/tetris/TetrisStone.h
r9348 r9629 54 54 { 55 55 public: 56 TetrisStone( BaseObject* creator); //!< Constructor. Registers and initializes the object.56 TetrisStone(Context* context); //!< Constructor. Registers and initializes the object. 57 57 virtual ~TetrisStone() {} 58 58 -
code/branches/core6/src/modules/towerdefense/Tower.cc
r9272 r9629 22 22 Constructor. Registers and initializes the object. 23 23 */ 24 Tower::Tower( BaseObject* creator) : Pawn(creator)24 Tower::Tower(Context* context) : Pawn(context) 25 25 { 26 26 RegisterObject(Tower); -
code/branches/core6/src/modules/towerdefense/Tower.h
r9272 r9629 27 27 { 28 28 public: 29 Tower( BaseObject* creator);29 Tower(Context* context); 30 30 virtual ~Tower() {}; 31 31 -
code/branches/core6/src/modules/towerdefense/TowerDefense.cc
r9579 r9629 96 96 CreateUnloadableFactory(TowerDefense); 97 97 98 TowerDefense::TowerDefense( BaseObject* creator) : Deathmatch(creator)98 TowerDefense::TowerDefense(Context* context) : Deathmatch(context) 99 99 { 100 100 RegisterObject(TowerDefense); … … 190 190 191 191 // Create tower 192 Tower* newTower = new Tower(this->center_ );192 Tower* newTower = new Tower(this->center_->getContext()); 193 193 newTower->addTemplate(this->center_->getTowerTemplate()); 194 194 -
code/branches/core6/src/modules/towerdefense/TowerDefense.h
r9347 r9629 48 48 { 49 49 public: 50 TowerDefense( BaseObject* creator);50 TowerDefense(Context* context); 51 51 virtual ~TowerDefense(); 52 52 -
code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.cc
r9272 r9629 47 47 Constructor. Registers and initializes the object and checks whether the gametype is actually TowerDefense. 48 48 */ 49 TowerDefenseCenterpoint::TowerDefenseCenterpoint( BaseObject* creator) : MobileEntity(creator)49 TowerDefenseCenterpoint::TowerDefenseCenterpoint(Context* context) : MobileEntity(context) 50 50 { 51 51 RegisterObject(TowerDefenseCenterpoint); -
code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.h
r9272 r9629 49 49 { 50 50 public: 51 TowerDefenseCenterpoint( BaseObject* creator);51 TowerDefenseCenterpoint(Context* context); 52 52 virtual ~TowerDefenseCenterpoint() {} 53 53 -
code/branches/core6/src/modules/towerdefense/TowerDefenseController.cc
r9271 r9629 38 38 CreateFactory(TowerDefenseController); 39 39 40 TowerDefenseController::TowerDefenseController( BaseObject* creator) : WaypointController(creator)40 TowerDefenseController::TowerDefenseController(Context* context) : WaypointController(context) 41 41 { 42 42 RegisterObject(TowerDefenseController); -
code/branches/core6/src/modules/towerdefense/TowerDefenseController.h
r9271 r9629 40 40 { 41 41 public: 42 TowerDefenseController( BaseObject* creator);42 TowerDefenseController(Context* context); 43 43 virtual ~TowerDefenseController() {} 44 44 -
code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.cc
r9272 r9629 37 37 CreateFactory(TowerDefenseHUDController); 38 38 39 TowerDefenseHUDController::TowerDefenseHUDController( BaseObject* creator) : OverlayText(creator)39 TowerDefenseHUDController::TowerDefenseHUDController(Context* context) : OverlayText(context) 40 40 { 41 41 RegisterObject(TowerDefenseHUDController); -
code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.h
r9272 r9629 49 49 { 50 50 public: 51 TowerDefenseHUDController( BaseObject* creator);51 TowerDefenseHUDController(Context* context); 52 52 virtual ~TowerDefenseHUDController(); 53 53 -
code/branches/core6/src/modules/weapons/MuzzleFlash.cc
r8855 r9629 41 41 CreateFactory(MuzzleFlash); 42 42 43 MuzzleFlash::MuzzleFlash( BaseObject* creator) : Billboard(creator)43 MuzzleFlash::MuzzleFlash(Context* context) : Billboard(context) 44 44 { 45 45 RegisterObject(MuzzleFlash); -
code/branches/core6/src/modules/weapons/MuzzleFlash.h
r8855 r9629 55 55 { 56 56 public: 57 MuzzleFlash( BaseObject* creator);57 MuzzleFlash(Context* context); 58 58 virtual ~MuzzleFlash() {} 59 59 -
code/branches/core6/src/modules/weapons/RocketController.cc
r9348 r9629 45 45 Constructor. 46 46 */ 47 RocketController::RocketController( BaseObject* creator) : Controller(creator)47 RocketController::RocketController(Context* context) : Controller(context) 48 48 { 49 49 RegisterObject(RocketController); … … 51 51 52 52 // Create a rocket for the controller. 53 this->rocket_ = new SimpleRocket(this );53 this->rocket_ = new SimpleRocket(this->getContext()); 54 54 this->rocket_->setController(this); 55 55 this->setControllableEntity(orxonox_cast<ControllableEntity*>(this->rocket_)); -
code/branches/core6/src/modules/weapons/RocketController.h
r8855 r9629 52 52 { 53 53 public: 54 RocketController( BaseObject* creator);54 RocketController(Context* context); 55 55 virtual ~RocketController(); 56 56 -
code/branches/core6/src/modules/weapons/munitions/FusionMunition.cc
r8855 r9629 39 39 CreateFactory(FusionMunition); 40 40 41 FusionMunition::FusionMunition( BaseObject* creator) : Munition(creator)41 FusionMunition::FusionMunition(Context* context) : Munition(context) 42 42 { 43 43 RegisterObject(FusionMunition); -
code/branches/core6/src/modules/weapons/munitions/FusionMunition.h
r8855 r9629 51 51 { 52 52 public: 53 FusionMunition( BaseObject* creator);53 FusionMunition(Context* context); 54 54 virtual ~FusionMunition() {} 55 55 }; -
code/branches/core6/src/modules/weapons/munitions/LaserMunition.cc
r8855 r9629 39 39 CreateFactory(LaserMunition); 40 40 41 LaserMunition::LaserMunition( BaseObject* creator) : ReplenishingMunition(creator)41 LaserMunition::LaserMunition(Context* context) : ReplenishingMunition(context) 42 42 { 43 43 RegisterObject(LaserMunition); -
code/branches/core6/src/modules/weapons/munitions/LaserMunition.h
r8855 r9629 51 51 { 52 52 public: 53 LaserMunition( BaseObject* creator);53 LaserMunition(Context* context); 54 54 virtual ~LaserMunition() {} 55 55 }; -
code/branches/core6/src/modules/weapons/munitions/ReplenishingMunition.cc
r8855 r9629 41 41 CreateFactory(ReplenishingMunition); 42 42 43 ReplenishingMunition::ReplenishingMunition( BaseObject* creator) : Munition(creator)43 ReplenishingMunition::ReplenishingMunition(Context* context) : Munition(context) 44 44 { 45 45 RegisterObject(ReplenishingMunition); -
code/branches/core6/src/modules/weapons/munitions/ReplenishingMunition.h
r8855 r9629 53 53 { 54 54 public: 55 ReplenishingMunition( BaseObject* creator);55 ReplenishingMunition(Context* context); 56 56 virtual ~ReplenishingMunition() {} 57 57 -
code/branches/core6/src/modules/weapons/munitions/RocketMunition.cc
r8855 r9629 39 39 CreateFactory(RocketMunition); 40 40 41 RocketMunition::RocketMunition( BaseObject* creator) : Munition(creator)41 RocketMunition::RocketMunition(Context* context) : Munition(context) 42 42 { 43 43 RegisterObject(RocketMunition); -
code/branches/core6/src/modules/weapons/munitions/RocketMunition.h
r8855 r9629 51 51 { 52 52 public: 53 RocketMunition( BaseObject* creator);53 RocketMunition(Context* context); 54 54 virtual ~RocketMunition() {} 55 55 }; -
code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc
r9567 r9629 106 106 { 107 107 { 108 ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getC reator());108 ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext()); 109 109 effect->setPosition(entity->getPosition()); 110 110 effect->setOrientation(entity->getOrientation()); … … 115 115 // Second effect with same condition 116 116 { 117 ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getC reator());117 ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext()); 118 118 effect->setPosition(entity->getPosition()); 119 119 effect->setOrientation(entity->getOrientation()); … … 127 127 if (victim && victim->hasShield() && (this->getDamage() > 0.0f || this->getShieldDamage() > 0.0f) && victim->getHealth() > 0.0f) 128 128 { 129 ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getC reator());129 ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext()); 130 130 effect->setDestroyAfterLife(true); 131 131 effect->setSource("Orxonox/Shield"); -
code/branches/core6/src/modules/weapons/projectiles/BillboardProjectile.cc
r8855 r9629 42 42 CreateFactory(BillboardProjectile); 43 43 44 BillboardProjectile::BillboardProjectile( BaseObject* creator) : Projectile(creator)44 BillboardProjectile::BillboardProjectile(Context* context) : Projectile(context) 45 45 { 46 46 RegisterObject(BillboardProjectile); -
code/branches/core6/src/modules/weapons/projectiles/BillboardProjectile.h
r8855 r9629 55 55 { 56 56 public: 57 BillboardProjectile( BaseObject* creator);57 BillboardProjectile(Context* context); 58 58 virtual ~BillboardProjectile(); 59 59 -
code/branches/core6/src/modules/weapons/projectiles/LightningGunProjectile.cc
r8855 r9629 42 42 CreateFactory(LightningGunProjectile); 43 43 44 LightningGunProjectile::LightningGunProjectile( BaseObject* creator) : BillboardProjectile(creator)44 LightningGunProjectile::LightningGunProjectile(Context* context) : BillboardProjectile(context) 45 45 { 46 46 RegisterObject(LightningGunProjectile); -
code/branches/core6/src/modules/weapons/projectiles/LightningGunProjectile.h
r8855 r9629 55 55 { 56 56 public: 57 LightningGunProjectile( BaseObject* creator);57 LightningGunProjectile(Context* context); 58 58 virtual ~LightningGunProjectile() {} 59 59 -
code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.cc
r9589 r9629 43 43 CreateFactory(ParticleProjectile); 44 44 45 ParticleProjectile::ParticleProjectile( BaseObject* creator) : BillboardProjectile(creator)45 ParticleProjectile::ParticleProjectile(Context* context) : BillboardProjectile(context) 46 46 { 47 47 RegisterObject(ParticleProjectile); -
code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.h
r8855 r9629 51 51 { 52 52 public: 53 ParticleProjectile( BaseObject* creator);53 ParticleProjectile(Context* context); 54 54 virtual ~ParticleProjectile(); 55 55 virtual void changedVisibility(); -
code/branches/core6/src/modules/weapons/projectiles/Projectile.cc
r9558 r9629 46 46 CreateFactory(Projectile); 47 47 48 Projectile::Projectile( BaseObject* creator) : MovableEntity(creator), BasicProjectile()48 Projectile::Projectile(Context* context) : MovableEntity(context), BasicProjectile() 49 49 { 50 50 RegisterObject(Projectile); … … 60 60 this->setCollisionType(Kinematic); 61 61 62 SphereCollisionShape* shape = new SphereCollisionShape(this );62 SphereCollisionShape* shape = new SphereCollisionShape(this->getContext()); 63 63 shape->setRadius(20.0f); 64 64 this->attachCollisionShape(shape); -
code/branches/core6/src/modules/weapons/projectiles/Projectile.h
r8855 r9629 58 58 { 59 59 public: 60 Projectile( BaseObject* creator);60 Projectile(Context* context); 61 61 virtual ~Projectile(); 62 62 -
code/branches/core6/src/modules/weapons/projectiles/Rocket.cc
r9016 r9629 57 57 Constructor. Registers the object and initializes some default values. 58 58 */ 59 Rocket::Rocket( BaseObject* creator)60 : ControllableEntity(c reator)59 Rocket::Rocket(Context* context) 60 : ControllableEntity(context) 61 61 , BasicProjectile() 62 , RadarViewable( creator, static_cast<WorldEntity*>(this))62 , RadarViewable(this, static_cast<WorldEntity*>(this)) 63 63 { 64 64 RegisterObject(Rocket);// Register the Rocket class to the core … … 73 73 74 74 // Create rocket model 75 Model* model = new Model(this );75 Model* model = new Model(this->getContext()); 76 76 model->setMeshSource("rocket.mesh"); 77 77 model->scale(0.7f); … … 79 79 80 80 // Add effects. 81 ParticleEmitter* fire = new ParticleEmitter(this );81 ParticleEmitter* fire = new ParticleEmitter(this->getContext()); 82 82 this->attach(fire); 83 83 fire->setOrientation(this->getOrientation()); … … 89 89 90 90 // Add collision shape 91 ConeCollisionShape* collisionShape = new ConeCollisionShape(this );91 ConeCollisionShape* collisionShape = new ConeCollisionShape(this->getContext()); 92 92 collisionShape->setRadius(3); 93 93 collisionShape->setHeight(500); … … 97 97 98 98 // Add sound 99 this->defSndWpnEngine_ = new WorldSound(this );99 this->defSndWpnEngine_ = new WorldSound(this->getContext()); 100 100 this->defSndWpnEngine_->setLooping(true); 101 101 this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg"); … … 103 103 this->attach(defSndWpnEngine_); 104 104 105 this->defSndWpnLaunch_ = new WorldSound(this );105 this->defSndWpnLaunch_ = new WorldSound(this->getContext()); 106 106 this->defSndWpnLaunch_->setLooping(false); 107 107 this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg"); … … 116 116 117 117 // Add camera 118 CameraPosition* camPosition = new CameraPosition(this );118 CameraPosition* camPosition = new CameraPosition(this->getContext()); 119 119 camPosition->setPosition(0,4,15); 120 120 camPosition->setAllowMouseLook(true); … … 226 226 if(this->getShooter()) 227 227 { 228 effect1 = new ParticleSpawner(this->getShooter()->getC reator());229 effect2 = new ParticleSpawner(this->getShooter()->getC reator());228 effect1 = new ParticleSpawner(this->getShooter()->getContext()); 229 effect2 = new ParticleSpawner(this->getShooter()->getContext()); 230 230 } 231 231 else 232 232 { 233 effect1 = new ParticleSpawner( static_cast<BaseObject*>(this->getScene().get()));234 effect2 = new ParticleSpawner( static_cast<BaseObject*>(this->getScene().get()));233 effect1 = new ParticleSpawner(this->getContext()); 234 effect2 = new ParticleSpawner(this->getContext()); 235 235 } 236 236 -
code/branches/core6/src/modules/weapons/projectiles/Rocket.h
r9016 r9629 59 59 { 60 60 public: 61 Rocket( BaseObject* creator);61 Rocket(Context* context); 62 62 virtual ~Rocket(); 63 63 -
code/branches/core6/src/modules/weapons/projectiles/SimpleRocket.cc
r8859 r9629 56 56 const float SimpleRocket::FUEL_PERCENTAGE = 0.8f; 57 57 58 SimpleRocket::SimpleRocket( BaseObject* creator)59 : ControllableEntity(c reator)58 SimpleRocket::SimpleRocket(Context* context) 59 : ControllableEntity(context) 60 60 , BasicProjectile() 61 , RadarViewable( creator, static_cast<WorldEntity*>(this))61 , RadarViewable(this, static_cast<WorldEntity*>(this)) 62 62 { 63 63 RegisterObject(SimpleRocket);// Register the SimpleRocket class to the core … … 74 74 75 75 // Create rocket model. 76 Model* model = new Model(this );76 Model* model = new Model(this->getContext()); 77 77 model->setMeshSource("rocket.mesh"); 78 78 model->scale(0.7f); … … 80 80 81 81 // Add effects. 82 this->fire_ = new ParticleEmitter(this );82 this->fire_ = new ParticleEmitter(this->getContext()); 83 83 this->attach(this->fire_); 84 84 … … 91 91 // Add collision shape. 92 92 // TODO: fix the orientation and size of this collision shape to match the rocket 93 ConeCollisionShape* collisionShape = new ConeCollisionShape(this );93 ConeCollisionShape* collisionShape = new ConeCollisionShape(this->getContext()); 94 94 collisionShape->setOrientation(this->getOrientation()); 95 95 collisionShape->setRadius(1.5f); -
code/branches/core6/src/modules/weapons/projectiles/SimpleRocket.h
r8859 r9629 60 60 { 61 61 public: 62 SimpleRocket( BaseObject* creator);62 SimpleRocket(Context* context); 63 63 virtual ~SimpleRocket(); 64 64 virtual void tick(float dt); -
code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.cc
r8855 r9629 51 51 CreateFactory(EnergyDrink); 52 52 53 EnergyDrink::EnergyDrink( BaseObject* creator) : WeaponMode(creator)53 EnergyDrink::EnergyDrink(Context* context) : WeaponMode(context) 54 54 { 55 55 RegisterObject(EnergyDrink); … … 101 101 { 102 102 // Create the projectile 103 Projectile* projectile = new Projectile(this );104 Model* model = new Model(projectile );103 Projectile* projectile = new Projectile(this->getContext()); 104 Model* model = new Model(projectile->getContext()); 105 105 model->setMeshSource("can.mesh"); 106 106 model->setCastShadows(false); … … 127 127 void EnergyDrink::muzzleflash() 128 128 { 129 MuzzleFlash *muzzleFlash = new MuzzleFlash(this );129 MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext()); 130 130 this->getWeapon()->attach(muzzleFlash); 131 131 muzzleFlash->setPosition(this->getMuzzleOffset()); -
code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.h
r8855 r9629 54 54 { 55 55 public: 56 EnergyDrink( BaseObject* creator);56 EnergyDrink(Context* context); 57 57 virtual ~EnergyDrink() {} 58 58 -
code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.cc
r8855 r9629 48 48 CreateFactory(FusionFire); 49 49 50 FusionFire::FusionFire( BaseObject* creator) : WeaponMode(creator)50 FusionFire::FusionFire(Context* context) : WeaponMode(context) 51 51 { 52 52 RegisterObject(FusionFire); … … 66 66 void FusionFire::fire() 67 67 { 68 BillboardProjectile* projectile = new BillboardProjectile(this );68 BillboardProjectile* projectile = new BillboardProjectile(this->getContext()); 69 69 70 70 projectile->setOrientation(this->getMuzzleOrientation()); -
code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.h
r8855 r9629 51 51 { 52 52 public: 53 FusionFire( BaseObject* creator);53 FusionFire(Context* context); 54 54 virtual ~FusionFire() {} 55 55 -
code/branches/core6/src/modules/weapons/weaponmodes/HsW01.cc
r9526 r9629 52 52 CreateFactory(HsW01); 53 53 54 HsW01::HsW01( BaseObject* creator) : WeaponMode(creator)54 HsW01::HsW01(Context* context) : WeaponMode(context) 55 55 { 56 56 RegisterObject(HsW01); … … 111 111 112 112 // Create the projectile. 113 Projectile* projectile = new Projectile(this );114 Model* model = new Model(projectile );113 Projectile* projectile = new Projectile(this->getContext()); 114 Model* model = new Model(projectile->getContext()); 115 115 model->setMeshSource(mesh_); 116 116 model->setCastShadows(false); … … 138 138 void HsW01::muzzleflash() 139 139 { 140 MuzzleFlash *muzzleFlash = new MuzzleFlash(this );140 MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext()); 141 141 this->getWeapon()->attach(muzzleFlash); 142 142 muzzleFlash->setPosition(this->getMuzzleOffset()); -
code/branches/core6/src/modules/weapons/weaponmodes/HsW01.h
r9526 r9629 53 53 { 54 54 public: 55 HsW01( BaseObject* creator);55 HsW01(Context* context); 56 56 virtual ~HsW01(); 57 57 -
code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.cc
r8855 r9629 47 47 CreateFactory(LaserFire); 48 48 49 LaserFire::LaserFire( BaseObject* creator) : WeaponMode(creator)49 LaserFire::LaserFire(Context* context) : WeaponMode(context) 50 50 { 51 51 RegisterObject(LaserFire); … … 64 64 void LaserFire::fire() 65 65 { 66 ParticleProjectile* projectile = new ParticleProjectile(this );66 ParticleProjectile* projectile = new ParticleProjectile(this->getContext()); 67 67 68 68 projectile->setOrientation(this->getMuzzleOrientation()); -
code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.h
r8855 r9629 51 51 { 52 52 public: 53 LaserFire( BaseObject* creator);53 LaserFire(Context* context); 54 54 virtual ~LaserFire() {} 55 55 -
code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.cc
r9016 r9629 46 46 CreateFactory(LightningGun); 47 47 48 LightningGun::LightningGun( BaseObject* creator) : WeaponMode(creator)48 LightningGun::LightningGun(Context* context) : WeaponMode(context) 49 49 { 50 50 RegisterObject(LightningGun); … … 68 68 void LightningGun::fire() 69 69 { 70 LightningGunProjectile* projectile = new LightningGunProjectile(this );70 LightningGunProjectile* projectile = new LightningGunProjectile(this->getContext()); 71 71 projectile->setMaterial("Flares/LightningBall_"); 72 72 -
code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.h
r8855 r9629 51 51 { 52 52 public: 53 LightningGun( BaseObject* creator);53 LightningGun(Context* context); 54 54 virtual ~LightningGun(); 55 55 -
code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.cc
r8855 r9629 48 48 CreateFactory(RocketFire); 49 49 50 RocketFire::RocketFire( BaseObject* creator) : WeaponMode(creator)50 RocketFire::RocketFire(Context* context) : WeaponMode(context) 51 51 { 52 52 RegisterObject(RocketFire); … … 71 71 void RocketFire::fire() 72 72 { 73 Rocket* rocket = new Rocket(this );73 Rocket* rocket = new Rocket(this->getContext()); 74 74 75 75 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); -
code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.h
r8855 r9629 51 51 { 52 52 public: 53 RocketFire( BaseObject* creator);53 RocketFire(Context* context); 54 54 virtual ~RocketFire(); 55 55 -
code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
r8855 r9629 52 52 CreateFactory(SimpleRocketFire); 53 53 54 SimpleRocketFire::SimpleRocketFire( BaseObject* creator) : WeaponMode(creator)54 SimpleRocketFire::SimpleRocketFire(Context* context) : WeaponMode(context) 55 55 { 56 56 RegisterObject(SimpleRocketFire); … … 76 76 void SimpleRocketFire::fire() 77 77 { 78 RocketController* controller = new RocketController(this );78 RocketController* controller = new RocketController(this->getContext()); 79 79 SimpleRocket* rocket = controller->getRocket(); 80 80 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); -
code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.h
r8855 r9629 50 50 { 51 51 public: 52 SimpleRocketFire( BaseObject* creator);52 SimpleRocketFire(Context* context); 53 53 virtual ~SimpleRocketFire(); 54 54 void deactivateFire(); -
code/branches/core6/src/orxonox/Level.cc
r9016 r9629 45 45 CreateFactory(Level); 46 46 47 Level::Level( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)47 Level::Level(Context* context) : BaseObject(context), Synchronisable(context), Context(context) 48 48 { 49 49 RegisterObject(Level); -
code/branches/core6/src/orxonox/Level.h
r9016 r9629 41 41 namespace orxonox 42 42 { 43 class _OrxonoxExport Level : public BaseObject, public Synchronisable 43 class _OrxonoxExport Level : public BaseObject, public Synchronisable, public Context 44 44 { 45 45 public: 46 Level( BaseObject* creator);46 Level(Context* context); 47 47 virtual ~Level(); 48 48 -
code/branches/core6/src/orxonox/LevelInfo.cc
r9348 r9629 250 250 The creator of this object. 251 251 */ 252 LevelInfo::LevelInfo( BaseObject* creator) : BaseObject(creator)252 LevelInfo::LevelInfo(Context* context) : BaseObject(context) 253 253 { 254 254 RegisterObject(LevelInfo); -
code/branches/core6/src/orxonox/LevelInfo.h
r9585 r9629 204 204 { 205 205 public: 206 LevelInfo( BaseObject* creator);206 LevelInfo(Context* context); 207 207 virtual ~LevelInfo(); 208 208 -
code/branches/core6/src/orxonox/Scene.cc
r9348 r9629 53 53 CreateFactory(Scene); 54 54 55 Scene::Scene( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)55 Scene::Scene(Context* context) : BaseObject(context), Synchronisable(context), Context(context) 56 56 { 57 57 RegisterObject(Scene); -
code/branches/core6/src/orxonox/Scene.h
r6417 r9629 45 45 namespace orxonox 46 46 { 47 class _OrxonoxExport Scene : public BaseObject, public Synchronisable, public Tickable 47 class _OrxonoxExport Scene : public BaseObject, public Synchronisable, public Tickable, public Context 48 48 { 49 49 public: 50 Scene( BaseObject* creator);50 Scene(Context* context); 51 51 virtual ~Scene(); 52 52 -
code/branches/core6/src/orxonox/Test.cc
r9558 r9629 56 56 Test* Test::instance_ = 0; 57 57 58 Test::Test( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)58 Test::Test(Context* context) : BaseObject(context), Synchronisable(context) 59 59 { 60 60 assert(instance_==0); -
code/branches/core6/src/orxonox/Test.h
r8858 r9629 46 46 { 47 47 public: 48 Test( BaseObject* creator);48 Test(Context* context); 49 49 virtual ~Test(); 50 50 -
code/branches/core6/src/orxonox/chat/ChatHistory.cc
r8858 r9629 39 39 /* constructor */ 40 40 #ifndef CHATTEST 41 //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator)42 41 ChatHistory::ChatHistory() 43 42 #else -
code/branches/core6/src/orxonox/collisionshapes/CollisionShape.cc
r8858 r9629 49 49 Constructor. Registers and initializes the object. 50 50 */ 51 CollisionShape::CollisionShape( BaseObject* creator)52 : BaseObject(c reator)53 , Synchronisable(c reator)51 CollisionShape::CollisionShape(Context* context) 52 : BaseObject(context) 53 , Synchronisable(context) 54 54 { 55 55 RegisterObject(CollisionShape); -
code/branches/core6/src/orxonox/collisionshapes/CollisionShape.h
r8706 r9629 58 58 { 59 59 public: 60 CollisionShape( BaseObject* creator);60 CollisionShape(Context* context); 61 61 virtual ~CollisionShape(); 62 62 -
code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.cc
r8858 r9629 48 48 Constructor. Registers and initializes the object. 49 49 */ 50 CompoundCollisionShape::CompoundCollisionShape( BaseObject* creator) : CollisionShape(creator)50 CompoundCollisionShape::CompoundCollisionShape(Context* context) : CollisionShape(context) 51 51 { 52 52 RegisterObject(CompoundCollisionShape); -
code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.h
r8706 r9629 58 58 { 59 59 public: 60 CompoundCollisionShape( BaseObject* creator);60 CompoundCollisionShape(Context* context); 61 61 virtual ~CompoundCollisionShape(); 62 62 -
code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
r9612 r9629 37 37 namespace orxonox 38 38 { 39 WorldEntityCollisionShape::WorldEntityCollisionShape( BaseObject* creator) : CompoundCollisionShape(creator)39 WorldEntityCollisionShape::WorldEntityCollisionShape(Context* context) : CompoundCollisionShape(context) 40 40 { 41 41 RegisterObject(WorldEntityCollisionShape); -
code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.h
r9612 r9629 38 38 { 39 39 public: 40 WorldEntityCollisionShape( BaseObject* creator);40 WorldEntityCollisionShape(Context* context); 41 41 virtual ~WorldEntityCollisionShape(); 42 42 -
code/branches/core6/src/orxonox/controllers/AIController.cc
r9016 r9629 41 41 CreateFactory(AIController); 42 42 43 AIController::AIController( BaseObject* creator) : ArtificialController(creator)43 AIController::AIController(Context* context) : ArtificialController(context) 44 44 { 45 45 RegisterObject(AIController); -
code/branches/core6/src/orxonox/controllers/AIController.h
r9016 r9629 41 41 { 42 42 public: 43 AIController( BaseObject* creator);43 AIController(Context* context); 44 44 virtual ~AIController(); 45 45 -
code/branches/core6/src/orxonox/controllers/ArtificialController.cc
r9252 r9629 45 45 SetConsoleCommand("ArtificialController", "setbotlevel", &ArtificialController::setAllBotLevel); 46 46 47 ArtificialController::ArtificialController( BaseObject* creator) : FormationController(creator)47 ArtificialController::ArtificialController(Context* context) : FormationController(context) 48 48 { 49 49 RegisterObject(ArtificialController); -
code/branches/core6/src/orxonox/controllers/ArtificialController.h
r9252 r9629 39 39 { 40 40 public: 41 ArtificialController( BaseObject* creator);41 ArtificialController(Context* context); 42 42 virtual ~ArtificialController(); 43 43 -
code/branches/core6/src/orxonox/controllers/Controller.cc
r6417 r9629 35 35 CreateUnloadableFactory(Controller); 36 36 37 Controller::Controller( BaseObject* creator) : BaseObject(creator)37 Controller::Controller(Context* context) : BaseObject(context) 38 38 { 39 39 RegisterObject(Controller); -
code/branches/core6/src/orxonox/controllers/Controller.h
r8706 r9629 42 42 43 43 public: 44 Controller( BaseObject* creator);44 Controller(Context* context); 45 45 virtual ~Controller(); 46 46 -
code/branches/core6/src/orxonox/controllers/DroneController.cc
r8891 r9629 45 45 const float DroneController::ACTION_INTERVAL = 1.0f; 46 46 47 DroneController::DroneController( BaseObject* creator) : ArtificialController(creator)47 DroneController::DroneController(Context* context) : ArtificialController(context) 48 48 { 49 49 RegisterObject(DroneController); -
code/branches/core6/src/orxonox/controllers/DroneController.h
r9557 r9629 50 50 { 51 51 public: 52 DroneController( BaseObject* creator);52 DroneController(Context* context); 53 53 virtual ~DroneController(); 54 54 -
code/branches/core6/src/orxonox/controllers/FormationController.cc
r9348 r9629 69 69 static const float ROTATEFACTOR_FREE = 0.8f; 70 70 71 FormationController::FormationController( BaseObject* creator) : Controller(creator)71 FormationController::FormationController(Context* context) : Controller(context) 72 72 { 73 73 RegisterObject(FormationController); -
code/branches/core6/src/orxonox/controllers/FormationController.h
r9567 r9629 46 46 47 47 public: 48 FormationController( BaseObject* creator);48 FormationController(Context* context); 49 49 50 50 virtual ~FormationController(); -
code/branches/core6/src/orxonox/controllers/HumanController.cc
r9256 r9629 71 71 /*static*/ const float HumanController::BOOSTING_TIME = 0.1f; 72 72 73 HumanController::HumanController( BaseObject* creator) : FormationController(creator)73 HumanController::HumanController(Context* context) : FormationController(context) 74 74 { 75 75 RegisterObject(HumanController); -
code/branches/core6/src/orxonox/controllers/HumanController.h
r9256 r9629 44 44 { // tolua_export 45 45 public: 46 HumanController( BaseObject* creator);46 HumanController(Context* context); 47 47 virtual ~HumanController(); 48 48 -
code/branches/core6/src/orxonox/controllers/NewHumanController.cc
r9348 r9629 60 60 NewHumanController* NewHumanController::localController_s = 0; 61 61 62 NewHumanController::NewHumanController( BaseObject* creator)63 : HumanController(c reator)62 NewHumanController::NewHumanController(Context* context) 63 : HumanController(context) 64 64 , crossHairOverlay_(NULL) 65 65 , centerOverlay_(NULL) … … 98 98 if (GameMode::showsGraphics()) 99 99 { 100 crossHairOverlay_ = new OrxonoxOverlay(this );100 crossHairOverlay_ = new OrxonoxOverlay(this->getContext()); 101 101 crossHairOverlay_->setBackgroundMaterial("Orxonox/Crosshair3"); 102 102 crossHairOverlay_->setSize(Vector2(overlaySize_, overlaySize_)); … … 104 104 //crossHairOverlay_->setAspectCorrection(true); not working 105 105 106 centerOverlay_ = new OrxonoxOverlay(this );106 centerOverlay_ = new OrxonoxOverlay(this->getContext()); 107 107 centerOverlay_->setBackgroundMaterial("Orxonox/CenterOverlay"); 108 108 centerOverlay_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f)); … … 112 112 if (showDamageOverlay_) 113 113 { 114 damageOverlayTop_ = new OrxonoxOverlay(this );114 damageOverlayTop_ = new OrxonoxOverlay(this->getContext()); 115 115 damageOverlayTop_->setBackgroundMaterial("Orxonox/DamageOverlayTop"); 116 116 damageOverlayTop_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f)); … … 118 118 damageOverlayTop_->hide(); 119 119 120 damageOverlayRight_ = new OrxonoxOverlay(this );120 damageOverlayRight_ = new OrxonoxOverlay(this->getContext()); 121 121 damageOverlayRight_->setBackgroundMaterial("Orxonox/DamageOverlayRight"); 122 122 damageOverlayRight_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f)); … … 124 124 damageOverlayRight_->hide(); 125 125 126 damageOverlayBottom_ = new OrxonoxOverlay(this );126 damageOverlayBottom_ = new OrxonoxOverlay(this->getContext()); 127 127 damageOverlayBottom_->setBackgroundMaterial("Orxonox/DamageOverlayBottom"); 128 128 damageOverlayBottom_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f)); … … 130 130 damageOverlayBottom_->hide(); 131 131 132 damageOverlayLeft_ = new OrxonoxOverlay(this );132 damageOverlayLeft_ = new OrxonoxOverlay(this->getContext()); 133 133 damageOverlayLeft_->setBackgroundMaterial("Orxonox/DamageOverlayLeft"); 134 134 damageOverlayLeft_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f)); … … 139 139 if (showArrows_) 140 140 { 141 arrowsOverlay1_ = new OrxonoxOverlay(this );141 arrowsOverlay1_ = new OrxonoxOverlay(this->getContext()); 142 142 arrowsOverlay1_->setBackgroundMaterial("Orxonox/DirectionArrows1"); 143 143 arrowsOverlay1_->setSize(Vector2(0.02727f, 0.36f * arrowsSize_)); … … 146 146 arrowsOverlay1_->hide(); 147 147 148 arrowsOverlay2_ = new OrxonoxOverlay(this );148 arrowsOverlay2_ = new OrxonoxOverlay(this->getContext()); 149 149 arrowsOverlay2_->setBackgroundMaterial("Orxonox/DirectionArrows2"); 150 150 arrowsOverlay2_->setSize(Vector2(0.02727f, 0.59f * arrowsSize_)); … … 153 153 arrowsOverlay2_->hide(); 154 154 155 arrowsOverlay3_ = new OrxonoxOverlay(this );155 arrowsOverlay3_ = new OrxonoxOverlay(this->getContext()); 156 156 arrowsOverlay3_->setBackgroundMaterial("Orxonox/DirectionArrows3"); 157 157 arrowsOverlay3_->setSize(Vector2(0.02727f, 0.77f * arrowsSize_)); … … 160 160 arrowsOverlay3_->hide(); 161 161 162 arrowsOverlay4_ = new OrxonoxOverlay(this );162 arrowsOverlay4_ = new OrxonoxOverlay(this->getContext()); 163 163 arrowsOverlay4_->setBackgroundMaterial("Orxonox/DirectionArrows4"); 164 164 arrowsOverlay4_->setSize(Vector2(0.02727f, arrowsSize_)); -
code/branches/core6/src/orxonox/controllers/NewHumanController.h
r9016 r9629 42 42 { 43 43 public: 44 NewHumanController( BaseObject* creator);44 NewHumanController(Context* context); 45 45 virtual ~NewHumanController(); 46 46 -
code/branches/core6/src/orxonox/controllers/ScriptController.cc
r5781 r9629 34 34 CreateFactory(ScriptController); 35 35 36 ScriptController::ScriptController( BaseObject* creator) : ArtificialController(creator)36 ScriptController::ScriptController(Context* context) : ArtificialController(context) 37 37 { 38 38 RegisterObject(ScriptController); -
code/branches/core6/src/orxonox/controllers/ScriptController.h
r5781 r9629 38 38 { 39 39 public: 40 ScriptController( BaseObject* creator);40 ScriptController(Context* context); 41 41 virtual ~ScriptController() { } 42 42 -
code/branches/core6/src/orxonox/controllers/WaypointController.cc
r9252 r9629 36 36 CreateFactory(WaypointController); 37 37 38 WaypointController::WaypointController( BaseObject* creator) : ArtificialController(creator)38 WaypointController::WaypointController(Context* context) : ArtificialController(context) 39 39 { 40 40 RegisterObject(WaypointController); -
code/branches/core6/src/orxonox/controllers/WaypointController.h
r9252 r9629 41 41 { 42 42 public: 43 WaypointController( BaseObject* creator);43 WaypointController(Context* context); 44 44 virtual ~WaypointController(); 45 45 -
code/branches/core6/src/orxonox/controllers/WaypointPatrolController.cc
r9016 r9629 38 38 CreateFactory(WaypointPatrolController); 39 39 40 WaypointPatrolController::WaypointPatrolController( BaseObject* creator) : WaypointController(creator)40 WaypointPatrolController::WaypointPatrolController(Context* context) : WaypointController(context) 41 41 { 42 42 RegisterObject(WaypointPatrolController); -
code/branches/core6/src/orxonox/controllers/WaypointPatrolController.h
r9016 r9629 40 40 { 41 41 public: 42 WaypointPatrolController( BaseObject* creator);42 WaypointPatrolController(Context* context); 43 43 virtual ~WaypointPatrolController() {} 44 44 -
code/branches/core6/src/orxonox/gametypes/Asteroids.cc
r8858 r9629 37 37 CreateUnloadableFactory(Asteroids); 38 38 39 Asteroids::Asteroids( BaseObject* creator) : Gametype(creator)39 Asteroids::Asteroids(Context* context) : Gametype(context) 40 40 { 41 41 RegisterObject(Asteroids); -
code/branches/core6/src/orxonox/gametypes/Asteroids.h
r5781 r9629 38 38 { 39 39 public: 40 Asteroids( BaseObject* creator);40 Asteroids(Context* context); 41 41 virtual ~Asteroids() {} 42 42 -
code/branches/core6/src/orxonox/gametypes/Deathmatch.cc
r9348 r9629 38 38 CreateUnloadableFactory(Deathmatch); 39 39 40 Deathmatch::Deathmatch( BaseObject* creator) : Gametype(creator)40 Deathmatch::Deathmatch(Context* context) : Gametype(context) 41 41 { 42 42 RegisterObject(Deathmatch); -
code/branches/core6/src/orxonox/gametypes/Deathmatch.h
r9348 r9629 38 38 { 39 39 public: 40 Deathmatch( BaseObject* creator);40 Deathmatch(Context* context); 41 41 virtual ~Deathmatch() {} 42 42 -
code/branches/core6/src/orxonox/gametypes/Dynamicmatch.cc
r9558 r9629 64 64 CreateUnloadableFactory(Dynamicmatch); 65 65 66 Dynamicmatch::Dynamicmatch( BaseObject* creator) : Gametype(creator)66 Dynamicmatch::Dynamicmatch(Context* context) : Gametype(context) 67 67 { 68 68 RegisterObject(Dynamicmatch); -
code/branches/core6/src/orxonox/gametypes/Dynamicmatch.h
r9348 r9629 44 44 { 45 45 public: 46 Dynamicmatch( BaseObject* creator);46 Dynamicmatch(Context* context); 47 47 virtual ~Dynamicmatch() {} 48 48 -
code/branches/core6/src/orxonox/gametypes/Gametype.cc
r9558 r9629 49 49 CreateUnloadableFactory(Gametype); 50 50 51 Gametype::Gametype( BaseObject* creator) : BaseObject(creator)51 Gametype::Gametype(Context* context) : BaseObject(context) 52 52 { 53 53 RegisterObject(Gametype); 54 54 55 this->gtinfo_ = new GametypeInfo(c reator);55 this->gtinfo_ = new GametypeInfo(context); 56 56 57 57 this->setGametype(SmartPtr<Gametype>(this, false)); … … 74 74 if (GameMode::showsGraphics() && !this->scoreboardTemplate_.empty()) 75 75 { 76 this->scoreboard_ = new OverlayGroup( this);76 this->scoreboard_ = new OverlayGroup(context); 77 77 this->scoreboard_->addTemplate(this->scoreboardTemplate_); 78 78 this->scoreboard_->setGametype(this); … … 160 160 ControllableEntity* oldentity = it->first->getControllableEntity(); 161 161 162 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity );162 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity->getContext()); 163 163 if (oldentity->getCamera()) 164 164 { … … 283 283 this->gtinfo_->pawnKilled(victim->getPlayer()); 284 284 285 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getC reator());285 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getContext()); 286 286 if (victim->getCamera()) 287 287 { … … 458 458 { 459 459 // force spawn at spawnpoint with default pawn 460 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn );460 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn->getContext()); 461 461 spawn->spawn(entity); 462 462 player->startControl(entity); … … 472 472 { 473 473 for (unsigned int i = 0; i < amount; ++i) 474 this->botclass_.fabricate(this );474 this->botclass_.fabricate(this->getContext()); 475 475 } 476 476 -
code/branches/core6/src/orxonox/gametypes/Gametype.h
r9563 r9629 67 67 68 68 public: 69 Gametype( BaseObject* creator);69 Gametype(Context* context); 70 70 virtual ~Gametype(); 71 71 -
code/branches/core6/src/orxonox/gametypes/LastManStanding.cc
r9558 r9629 40 40 CreateUnloadableFactory(LastManStanding); 41 41 42 LastManStanding::LastManStanding( BaseObject* creator) : Deathmatch(creator)42 LastManStanding::LastManStanding(Context* context) : Deathmatch(context) 43 43 { 44 44 RegisterObject(LastManStanding); -
code/branches/core6/src/orxonox/gametypes/LastManStanding.h
r7655 r9629 65 65 66 66 public: 67 LastManStanding( BaseObject* creator); //!< Default Constructor.67 LastManStanding(Context* context); //!< Default Constructor. 68 68 virtual ~LastManStanding() {} //!< Default Destructor. 69 69 void setConfigValues(); //!< Makes values configurable. -
code/branches/core6/src/orxonox/gametypes/LastTeamStanding.cc
r9558 r9629 40 40 CreateUnloadableFactory(LastTeamStanding); 41 41 42 LastTeamStanding::LastTeamStanding( BaseObject* creator) : TeamDeathmatch(creator)42 LastTeamStanding::LastTeamStanding(Context* context) : TeamDeathmatch(context) 43 43 { 44 44 RegisterObject(LastTeamStanding); -
code/branches/core6/src/orxonox/gametypes/LastTeamStanding.h
r8351 r9629 71 71 72 72 public: 73 LastTeamStanding( BaseObject* creator); //!< Default Constructor.73 LastTeamStanding(Context* context); //!< Default Constructor. 74 74 virtual ~LastTeamStanding(); //!< Default Destructor. 75 75 -
code/branches/core6/src/orxonox/gametypes/Mission.cc
r9348 r9629 39 39 CreateUnloadableFactory(Mission); 40 40 41 Mission::Mission( BaseObject* creator) : TeamGametype(creator)41 Mission::Mission(Context* context) : TeamGametype(context) 42 42 { 43 43 RegisterObject(Mission); -
code/branches/core6/src/orxonox/gametypes/Mission.h
r9348 r9629 39 39 { 40 40 public: 41 Mission( BaseObject* creator);41 Mission(Context* context); 42 42 virtual ~Mission() {} 43 43 -
code/branches/core6/src/orxonox/gametypes/TeamBaseMatch.cc
r9348 r9629 38 38 CreateUnloadableFactory(TeamBaseMatch); 39 39 40 TeamBaseMatch::TeamBaseMatch( BaseObject* creator) : TeamDeathmatch(creator)40 TeamBaseMatch::TeamBaseMatch(Context* context) : TeamDeathmatch(context) 41 41 { 42 42 RegisterObject(TeamBaseMatch); -
code/branches/core6/src/orxonox/gametypes/TeamBaseMatch.h
r9348 r9629 41 41 { 42 42 public: 43 TeamBaseMatch( BaseObject* creator);43 TeamBaseMatch(Context* context); 44 44 virtual ~TeamBaseMatch() {} 45 45 -
code/branches/core6/src/orxonox/gametypes/TeamDeathmatch.cc
r9348 r9629 38 38 CreateUnloadableFactory(TeamDeathmatch); 39 39 40 TeamDeathmatch::TeamDeathmatch( BaseObject* creator) : TeamGametype(creator)40 TeamDeathmatch::TeamDeathmatch(Context* context) : TeamGametype(context) 41 41 { 42 42 RegisterObject(TeamDeathmatch); -
code/branches/core6/src/orxonox/gametypes/TeamDeathmatch.h
r9348 r9629 38 38 { 39 39 public: 40 TeamDeathmatch( BaseObject* creator);40 TeamDeathmatch(Context* context); 41 41 virtual ~TeamDeathmatch() {} 42 42 -
code/branches/core6/src/orxonox/gametypes/TeamGametype.cc
r9558 r9629 42 42 CreateUnloadableFactory(TeamGametype); 43 43 44 TeamGametype::TeamGametype( BaseObject* creator) : Gametype(creator)44 TeamGametype::TeamGametype(Context* context) : Gametype(context) 45 45 { 46 46 RegisterObject(TeamGametype); -
code/branches/core6/src/orxonox/gametypes/TeamGametype.h
r9348 r9629 41 41 { 42 42 public: 43 TeamGametype( BaseObject* creator);43 TeamGametype(Context* context); 44 44 virtual ~TeamGametype() {} 45 45 -
code/branches/core6/src/orxonox/gametypes/UnderAttack.cc
r9558 r9629 40 40 CreateUnloadableFactory(UnderAttack); 41 41 42 UnderAttack::UnderAttack( BaseObject* creator) : TeamDeathmatch(creator)42 UnderAttack::UnderAttack(Context* context) : TeamDeathmatch(context) 43 43 { 44 44 RegisterObject(UnderAttack); -
code/branches/core6/src/orxonox/gametypes/UnderAttack.h
r5929 r9629 39 39 { 40 40 public: 41 UnderAttack( BaseObject* creator);41 UnderAttack(Context* context); 42 42 virtual ~UnderAttack() {} 43 43 -
code/branches/core6/src/orxonox/graphics/AnimatedModel.cc
r8858 r9629 41 41 CreateFactory(AnimatedModel); 42 42 43 AnimatedModel::AnimatedModel( BaseObject* creator) : Model(creator)43 AnimatedModel::AnimatedModel(Context* context) : Model(context) 44 44 { 45 45 RegisterObject(AnimatedModel); -
code/branches/core6/src/orxonox/graphics/AnimatedModel.h
r8858 r9629 41 41 { 42 42 public: 43 AnimatedModel( BaseObject* creator);43 AnimatedModel(Context* context); 44 44 virtual ~AnimatedModel(); 45 45 -
code/branches/core6/src/orxonox/graphics/Backlight.cc
r8424 r9629 47 47 CreateFactory(Backlight); 48 48 49 Backlight::Backlight( BaseObject* creator) : FadingBillboard(creator)49 Backlight::Backlight(Context* context) : FadingBillboard(context) 50 50 { 51 51 RegisterObject(Backlight); -
code/branches/core6/src/orxonox/graphics/Backlight.h
r7163 r9629 41 41 { 42 42 public: 43 Backlight( BaseObject* creator);43 Backlight(Context* context); 44 44 virtual ~Backlight(); 45 45 -
code/branches/core6/src/orxonox/graphics/Billboard.cc
r8706 r9629 40 40 CreateFactory(Billboard); 41 41 42 Billboard::Billboard( BaseObject* creator) : StaticEntity(creator)42 Billboard::Billboard(Context* context) : StaticEntity(context) 43 43 { 44 44 RegisterObject(Billboard); -
code/branches/core6/src/orxonox/graphics/Billboard.h
r8706 r9629 44 44 { 45 45 public: 46 Billboard( BaseObject* creator);46 Billboard(Context* context); 47 47 virtual ~Billboard(); 48 48 -
code/branches/core6/src/orxonox/graphics/BlinkingBillboard.cc
r8351 r9629 37 37 CreateFactory(BlinkingBillboard); 38 38 39 BlinkingBillboard::BlinkingBillboard( BaseObject* creator) : Billboard(creator)39 BlinkingBillboard::BlinkingBillboard(Context* context) : Billboard(context) 40 40 { 41 41 RegisterObject(BlinkingBillboard); -
code/branches/core6/src/orxonox/graphics/BlinkingBillboard.h
r8351 r9629 41 41 { 42 42 public: 43 BlinkingBillboard( BaseObject* creator);43 BlinkingBillboard(Context* context); 44 44 virtual ~BlinkingBillboard(); 45 45 -
code/branches/core6/src/orxonox/graphics/Camera.cc
r9558 r9629 48 48 CreateFactory(Camera); 49 49 50 Camera::Camera( BaseObject* creator) : StaticEntity(creator)50 Camera::Camera(Context* context) : StaticEntity(context) 51 51 { 52 52 RegisterObject(Camera); -
code/branches/core6/src/orxonox/graphics/Camera.h
r8706 r9629 46 46 47 47 public: 48 Camera( BaseObject* creator);48 Camera(Context* context); 49 49 virtual ~Camera(); 50 50 -
code/branches/core6/src/orxonox/graphics/FadingBillboard.cc
r5929 r9629 36 36 CreateFactory(FadingBillboard); 37 37 38 FadingBillboard::FadingBillboard( BaseObject* creator) : Billboard(creator)38 FadingBillboard::FadingBillboard(Context* context) : Billboard(context) 39 39 { 40 40 RegisterObject(FadingBillboard); -
code/branches/core6/src/orxonox/graphics/FadingBillboard.h
r7163 r9629 42 42 { 43 43 public: 44 FadingBillboard( BaseObject* creator);44 FadingBillboard(Context* context); 45 45 virtual ~FadingBillboard(); 46 46 -
code/branches/core6/src/orxonox/graphics/GlobalShader.cc
r8079 r9629 38 38 CreateFactory(GlobalShader); 39 39 40 GlobalShader::GlobalShader( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)40 GlobalShader::GlobalShader(Context* context) : BaseObject(context), Synchronisable(context) 41 41 { 42 42 RegisterObject(GlobalShader); -
code/branches/core6/src/orxonox/graphics/GlobalShader.h
r8079 r9629 41 41 { 42 42 public: 43 GlobalShader( BaseObject* creator);43 GlobalShader(Context* context); 44 44 virtual ~GlobalShader(); 45 45 -
code/branches/core6/src/orxonox/graphics/Light.cc
r5781 r9629 49 49 BOOST_STATIC_ASSERT((int)Ogre::Light::LT_SPOTLIGHT == (int)Light::Spotlight); 50 50 51 Light::Light( BaseObject* creator) : StaticEntity(creator)51 Light::Light(Context* context) : StaticEntity(context) 52 52 { 53 53 RegisterObject(Light); -
code/branches/core6/src/orxonox/graphics/Light.h
r7401 r9629 53 53 54 54 public: 55 Light( BaseObject* creator);55 Light(Context* context); 56 56 virtual ~Light(); 57 57 -
code/branches/core6/src/orxonox/graphics/MeshLodInformation.cc
r7183 r9629 40 40 CreateFactory(MeshLodInformation); 41 41 42 MeshLodInformation::MeshLodInformation( BaseObject* creator)43 : BaseObject(c reator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15f)42 MeshLodInformation::MeshLodInformation(Context* context) 43 : BaseObject(context), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15f) 44 44 { 45 45 RegisterObject(MeshLodInformation); -
code/branches/core6/src/orxonox/graphics/MeshLodInformation.h
r7163 r9629 41 41 { 42 42 public: 43 MeshLodInformation( BaseObject* creator);43 MeshLodInformation(Context* context); 44 44 virtual ~MeshLodInformation(); 45 45 -
code/branches/core6/src/orxonox/graphics/Model.cc
r9558 r9629 43 43 CreateFactory(Model); 44 44 45 Model::Model( BaseObject* creator) :46 StaticEntity(c reator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15f)45 Model::Model(Context* context) : 46 StaticEntity(context), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15f) 47 47 { 48 48 RegisterObject(Model); -
code/branches/core6/src/orxonox/graphics/Model.h
r7166 r9629 41 41 { 42 42 public: 43 Model( BaseObject* creator);43 Model(Context* context); 44 44 virtual ~Model(); 45 45 -
code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc
r9589 r9629 45 45 CreateFactory(ParticleEmitter); 46 46 47 ParticleEmitter::ParticleEmitter( BaseObject* creator) : StaticEntity(creator)47 ParticleEmitter::ParticleEmitter(Context* context) : StaticEntity(context) 48 48 { 49 49 RegisterObject(ParticleEmitter); -
code/branches/core6/src/orxonox/graphics/ParticleEmitter.h
r7904 r9629 40 40 { 41 41 public: 42 ParticleEmitter( BaseObject* creator);42 ParticleEmitter(Context* context); 43 43 virtual ~ParticleEmitter(); 44 44 -
code/branches/core6/src/orxonox/graphics/ParticleSpawner.cc
r7284 r9629 39 39 CreateFactory(ParticleSpawner); 40 40 41 ParticleSpawner::ParticleSpawner( BaseObject* creator) : ParticleEmitter(creator)41 ParticleSpawner::ParticleSpawner(Context* context) : ParticleEmitter(context) 42 42 { 43 43 RegisterObject(ParticleSpawner); -
code/branches/core6/src/orxonox/graphics/ParticleSpawner.h
r5929 r9629 40 40 { 41 41 public: 42 ParticleSpawner( BaseObject* creator);42 ParticleSpawner(Context* context); 43 43 virtual ~ParticleSpawner(); 44 44 -
code/branches/core6/src/orxonox/infos/Bot.cc
r9558 r9629 40 40 CreateFactory(Bot); 41 41 42 Bot::Bot( BaseObject* creator) : PlayerInfo(creator)42 Bot::Bot(Context* context) : PlayerInfo(context) 43 43 { 44 44 RegisterObject(Bot); -
code/branches/core6/src/orxonox/infos/Bot.h
r5781 r9629 40 40 { 41 41 public: 42 Bot( BaseObject* creator);42 Bot(Context* context); 43 43 virtual ~Bot(); 44 44 -
code/branches/core6/src/orxonox/infos/GametypeInfo.cc
r9348 r9629 65 65 Registers and initializes the object. 66 66 */ 67 GametypeInfo::GametypeInfo( BaseObject* creator) : Info(creator)67 GametypeInfo::GametypeInfo(Context* context) : Info(context) 68 68 { 69 69 RegisterObject(GametypeInfo); -
code/branches/core6/src/orxonox/infos/GametypeInfo.h
r9348 r9629 58 58 59 59 public: 60 GametypeInfo( BaseObject* creator);60 GametypeInfo(Context* context); 61 61 virtual ~GametypeInfo(); 62 62 -
code/branches/core6/src/orxonox/infos/HumanPlayer.cc
r9558 r9629 43 43 CreateUnloadableFactory(HumanPlayer); 44 44 45 HumanPlayer::HumanPlayer( BaseObject* creator) : PlayerInfo(creator)45 HumanPlayer::HumanPlayer(Context* context) : PlayerInfo(context) 46 46 { 47 47 RegisterObject(HumanPlayer); … … 183 183 if (this->isLocalPlayer() && !this->humanHudTemplate_.empty() && GameMode::showsGraphics()) 184 184 { 185 this->humanHud_ = new OverlayGroup(this );185 this->humanHud_ = new OverlayGroup(this->getContext()); 186 186 this->humanHud_->addTemplate(this->humanHudTemplate_); 187 187 this->humanHud_->setOwner(this); … … 199 199 if (this->isLocalPlayer() && !this->gametypeHudTemplate_.empty()) 200 200 { 201 this->gametypeHud_ = new OverlayGroup(this );201 this->gametypeHud_ = new OverlayGroup(this->getContext()); 202 202 this->gametypeHud_->addTemplate(this->gametypeHudTemplate_); 203 203 this->gametypeHud_->setOwner(this); -
code/branches/core6/src/orxonox/infos/HumanPlayer.h
r7163 r9629 40 40 { 41 41 public: 42 HumanPlayer( BaseObject* creator);42 HumanPlayer(Context* context); 43 43 virtual ~HumanPlayer(); 44 44 -
code/branches/core6/src/orxonox/infos/Info.cc
r5781 r9629 32 32 namespace orxonox 33 33 { 34 Info::Info( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)34 Info::Info(Context* context) : BaseObject(context), Synchronisable(context) 35 35 { 36 36 RegisterObject(Info); -
code/branches/core6/src/orxonox/infos/Info.h
r5781 r9629 40 40 { 41 41 public: 42 Info( BaseObject* creator);42 Info(Context* context); 43 43 virtual ~Info() {} 44 44 }; -
code/branches/core6/src/orxonox/infos/PlayerInfo.cc
r9348 r9629 40 40 namespace orxonox 41 41 { 42 PlayerInfo::PlayerInfo( BaseObject* creator) : Info(creator)42 PlayerInfo::PlayerInfo(Context* context) : Info(context) 43 43 { 44 44 RegisterObject(PlayerInfo); … … 136 136 this->controller_ = 0; 137 137 } 138 this->controller_ = this->defaultController_.fabricate(this );138 this->controller_ = this->defaultController_.fabricate(this->getContext()); 139 139 assert(this->controller_); 140 140 this->controller_->setPlayer(this); -
code/branches/core6/src/orxonox/infos/PlayerInfo.h
r9563 r9629 41 41 { // tolua_export 42 42 public: 43 PlayerInfo( BaseObject* creator);43 PlayerInfo(Context* context); 44 44 virtual ~PlayerInfo(); 45 45 -
code/branches/core6/src/orxonox/items/Engine.cc
r9558 r9629 46 46 Constructor. Registers and initializes the object. 47 47 */ 48 Engine::Engine( BaseObject* creator) : Item(creator)48 Engine::Engine(Context* context) : Item(context) 49 49 { 50 50 RegisterObject(Engine); -
code/branches/core6/src/orxonox/items/Engine.h
r8727 r9629 56 56 { 57 57 public: 58 Engine( BaseObject* creator);58 Engine(Context* context); 59 59 virtual ~Engine(); 60 60 -
code/branches/core6/src/orxonox/items/Item.cc
r5781 r9629 32 32 namespace orxonox 33 33 { 34 Item::Item( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)34 Item::Item(Context* context) : BaseObject(context), Synchronisable(context) 35 35 { 36 36 RegisterObject(Item); -
code/branches/core6/src/orxonox/items/Item.h
r5781 r9629 40 40 { 41 41 public: 42 Item( BaseObject* creator);42 Item(Context* context); 43 43 virtual ~Item() {} 44 44 }; -
code/branches/core6/src/orxonox/items/MultiStateEngine.cc
r8727 r9629 51 51 CreateFactory(MultiStateEngine); 52 52 53 MultiStateEngine::MultiStateEngine( BaseObject* creator) : Engine(creator)53 MultiStateEngine::MultiStateEngine(Context* context) : Engine(context) 54 54 { 55 55 RegisterObject(MultiStateEngine); … … 57 57 if (GameMode::isMaster()) 58 58 { 59 this->defEngineSndNormal_ = new WorldSound(this );60 this->defEngineSndBoost_ = new WorldSound(this );59 this->defEngineSndNormal_ = new WorldSound(this->getContext()); 60 this->defEngineSndBoost_ = new WorldSound(this->getContext()); 61 61 this->defEngineSndNormal_->setLooping(true); 62 62 this->defEngineSndBoost_->setLooping(true); -
code/branches/core6/src/orxonox/items/MultiStateEngine.h
r8727 r9629 49 49 }; 50 50 51 MultiStateEngine( BaseObject* creator);51 MultiStateEngine(Context* context); 52 52 virtual ~MultiStateEngine(); 53 53 -
code/branches/core6/src/orxonox/overlays/GUISheet.cc
r7401 r9629 38 38 CreateFactory(GUISheet); 39 39 40 GUISheet::GUISheet( BaseObject* creator)41 : BaseObject(c reator)40 GUISheet::GUISheet(Context* context) 41 : BaseObject(context) 42 42 , bShowOnLoad_(false) 43 43 , bHidePrevious_(false) -
code/branches/core6/src/orxonox/overlays/GUISheet.h
r7401 r9629 41 41 { 42 42 public: 43 GUISheet( BaseObject* creator);43 GUISheet(Context* context); 44 44 ~GUISheet(); 45 45 -
code/branches/core6/src/orxonox/overlays/OrxonoxOverlay.cc
r8858 r9629 63 63 SetConsoleCommand("OrxonoxOverlay", "rotateOverlay", &OrxonoxOverlay::rotateOverlay); 64 64 65 OrxonoxOverlay::OrxonoxOverlay( BaseObject* creator)66 : BaseObject(c reator)65 OrxonoxOverlay::OrxonoxOverlay(Context* context) 66 : BaseObject(context) 67 67 { 68 68 RegisterObject(OrxonoxOverlay); -
code/branches/core6/src/orxonox/overlays/OrxonoxOverlay.h
r9563 r9629 87 87 88 88 public: 89 OrxonoxOverlay( BaseObject* creator);89 OrxonoxOverlay(Context* context); 90 90 virtual ~OrxonoxOverlay(); 91 91 -
code/branches/core6/src/orxonox/overlays/OverlayGroup.cc
r8309 r9629 48 48 SetConsoleCommand("OverlayGroup", "scrollGroup", &OverlayGroup::scrollGroup); 49 49 50 OverlayGroup::OverlayGroup( BaseObject* creator)51 : BaseObject(c reator)50 OverlayGroup::OverlayGroup(Context* context) 51 : BaseObject(context) 52 52 { 53 53 RegisterObject(OverlayGroup); -
code/branches/core6/src/orxonox/overlays/OverlayGroup.h
r8309 r9629 54 54 { 55 55 public: 56 OverlayGroup( BaseObject* creator);56 OverlayGroup(Context* context); 57 57 //! Empty destructor. 58 58 ~OverlayGroup(); -
code/branches/core6/src/orxonox/sound/WorldAmbientSound.cc
r7854 r9629 38 38 CreateFactory(WorldAmbientSound); 39 39 40 WorldAmbientSound::WorldAmbientSound( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)40 WorldAmbientSound::WorldAmbientSound(Context* context) : BaseObject(context), Synchronisable(context) 41 41 { 42 42 RegisterObject(WorldAmbientSound); -
code/branches/core6/src/orxonox/sound/WorldAmbientSound.h
r7854 r9629 44 44 { 45 45 public: 46 WorldAmbientSound( BaseObject* creator);46 WorldAmbientSound(Context* context); 47 47 virtual ~WorldAmbientSound(); 48 48 -
code/branches/core6/src/orxonox/sound/WorldSound.cc
r8858 r9629 43 43 CreateFactory(WorldSound); 44 44 45 WorldSound::WorldSound( BaseObject* creator)46 : StaticEntity(c reator)45 WorldSound::WorldSound(Context* context) 46 : StaticEntity(context) 47 47 { 48 48 RegisterObject(WorldSound); -
code/branches/core6/src/orxonox/sound/WorldSound.h
r7854 r9629 45 45 { 46 46 public: 47 WorldSound( BaseObject* creator);47 WorldSound(Context* context); 48 48 49 49 void XMLPort(Element& xmlelement, XMLPort::Mode mode); -
code/branches/core6/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc
r5781 r9629 37 37 CreateFactory(DefaultWeaponmodeLink); 38 38 39 DefaultWeaponmodeLink::DefaultWeaponmodeLink( BaseObject* creator) : BaseObject(creator)39 DefaultWeaponmodeLink::DefaultWeaponmodeLink(Context* context) : BaseObject(context) 40 40 { 41 41 RegisterObject(DefaultWeaponmodeLink); -
code/branches/core6/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h
r5781 r9629 39 39 { 40 40 public: 41 DefaultWeaponmodeLink( BaseObject* creator);41 DefaultWeaponmodeLink(Context* context); 42 42 virtual ~DefaultWeaponmodeLink(); 43 43 -
code/branches/core6/src/orxonox/weaponsystem/Munition.cc
r8729 r9629 37 37 CreateFactory(Munition); 38 38 39 Munition::Munition( BaseObject* creator) : BaseObject(creator)39 Munition::Munition(Context* context) : BaseObject(context) 40 40 { 41 41 RegisterObject(Munition); -
code/branches/core6/src/orxonox/weaponsystem/Munition.h
r7851 r9629 56 56 57 57 public: 58 Munition( BaseObject* creator);58 Munition(Context* context); 59 59 virtual ~Munition(); 60 60 -
code/branches/core6/src/orxonox/weaponsystem/Weapon.cc
r5929 r9629 41 41 CreateFactory(Weapon); 42 42 43 Weapon::Weapon( BaseObject* creator) : StaticEntity(creator)43 Weapon::Weapon(Context* context) : StaticEntity(context) 44 44 { 45 45 RegisterObject(Weapon); -
code/branches/core6/src/orxonox/weaponsystem/Weapon.h
r5929 r9629 42 42 { 43 43 public: 44 Weapon( BaseObject* creator);44 Weapon(Context* context); 45 45 virtual ~Weapon(); 46 46 -
code/branches/core6/src/orxonox/weaponsystem/WeaponMode.cc
r8858 r9629 45 45 namespace orxonox 46 46 { 47 WeaponMode::WeaponMode( BaseObject* creator) : BaseObject(creator)47 WeaponMode::WeaponMode(Context* context) : BaseObject(context) 48 48 { 49 49 RegisterObject(WeaponMode); … … 75 75 if( GameMode::isMaster() ) 76 76 { 77 this->defSndWpnFire_ = new WorldSound(this );77 this->defSndWpnFire_ = new WorldSound(this->getContext()); 78 78 this->defSndWpnFire_->setLooping(false); 79 79 this->bSoundAttached_ = false; -
code/branches/core6/src/orxonox/weaponsystem/WeaponMode.h
r9563 r9629 44 44 { 45 45 public: 46 WeaponMode( BaseObject* creator);46 WeaponMode(Context* context); 47 47 virtual ~WeaponMode(); 48 48 -
code/branches/core6/src/orxonox/weaponsystem/WeaponPack.cc
r6417 r9629 40 40 CreateFactory(WeaponPack); 41 41 42 WeaponPack::WeaponPack( BaseObject* creator) : BaseObject(creator)42 WeaponPack::WeaponPack(Context* context) : BaseObject(context) 43 43 { 44 44 RegisterObject(WeaponPack); -
code/branches/core6/src/orxonox/weaponsystem/WeaponPack.h
r6417 r9629 41 41 { 42 42 public: 43 WeaponPack( BaseObject* creator);43 WeaponPack(Context* context); 44 44 virtual ~WeaponPack(); 45 45 -
code/branches/core6/src/orxonox/weaponsystem/WeaponSet.cc
r5781 r9629 39 39 CreateFactory(WeaponSet); 40 40 41 WeaponSet::WeaponSet( BaseObject* creator) : BaseObject(creator)41 WeaponSet::WeaponSet(Context* context) : BaseObject(context) 42 42 { 43 43 RegisterObject(WeaponSet); -
code/branches/core6/src/orxonox/weaponsystem/WeaponSet.h
r5781 r9629 41 41 { 42 42 public: 43 WeaponSet( BaseObject* creator);43 WeaponSet(Context* context); 44 44 virtual ~WeaponSet(); 45 45 -
code/branches/core6/src/orxonox/weaponsystem/WeaponSlot.cc
r8706 r9629 39 39 CreateFactory(WeaponSlot); 40 40 41 WeaponSlot::WeaponSlot( BaseObject* creator) : StaticEntity(creator)41 WeaponSlot::WeaponSlot(Context* context) : StaticEntity(context) 42 42 { 43 43 RegisterObject(WeaponSlot); -
code/branches/core6/src/orxonox/weaponsystem/WeaponSlot.h
r8891 r9629 57 57 { 58 58 public: 59 WeaponSlot( BaseObject* creator);59 WeaponSlot(Context* context); 60 60 virtual ~WeaponSlot(); 61 61 -
code/branches/core6/src/orxonox/weaponsystem/WeaponSystem.cc
r9563 r9629 48 48 CreateFactory(WeaponSystem); 49 49 50 WeaponSystem::WeaponSystem( BaseObject* creator) : BaseObject(creator)50 WeaponSystem::WeaponSystem(Context* context) : BaseObject(context) 51 51 { 52 52 RegisterObject(WeaponSystem); … … 308 308 else if (identifier->getIdentifier()->isA(Class(Munition))) 309 309 { 310 Munition* munition = identifier->fabricate(this );310 Munition* munition = identifier->fabricate(this->getContext()); 311 311 this->munitions_[identifier->getIdentifier()] = munition; 312 312 return munition; -
code/branches/core6/src/orxonox/weaponsystem/WeaponSystem.h
r6417 r9629 43 43 { 44 44 public: 45 WeaponSystem( BaseObject* creator);45 WeaponSystem(Context* context); 46 46 virtual ~WeaponSystem(); 47 47 -
code/branches/core6/src/orxonox/worldentities/BigExplosion.cc
r9589 r9629 43 43 CreateFactory(BigExplosion); 44 44 45 BigExplosion::BigExplosion( BaseObject* creator) : StaticEntity(creator)45 BigExplosion::BigExplosion(Context* context) : StaticEntity(context) 46 46 { 47 47 RegisterObject(BigExplosion); … … 80 80 void BigExplosion::init() 81 81 { 82 this->debrisEntity1_ = new MovableEntity(this );83 this->debrisEntity2_ = new MovableEntity(this );84 this->debrisEntity3_ = new MovableEntity(this );85 this->debrisEntity4_ = new MovableEntity(this );82 this->debrisEntity1_ = new MovableEntity(this->getContext()); 83 this->debrisEntity2_ = new MovableEntity(this->getContext()); 84 this->debrisEntity3_ = new MovableEntity(this->getContext()); 85 this->debrisEntity4_ = new MovableEntity(this->getContext()); 86 86 87 87 this->debrisEntity1_->setSyncMode(0); … … 90 90 this->debrisEntity4_->setSyncMode(0); 91 91 92 this->debris1_ = new Model(this );93 this->debris2_ = new Model(this );94 this->debris3_ = new Model(this );95 this->debris4_ = new Model(this );92 this->debris1_ = new Model(this->getContext()); 93 this->debris2_ = new Model(this->getContext()); 94 this->debris3_ = new Model(this->getContext()); 95 this->debris4_ = new Model(this->getContext()); 96 96 97 97 this->debris1_->setSyncMode(0); … … 100 100 this->debris4_->setSyncMode(0); 101 101 102 this->explosion_ = new StaticEntity(this );102 this->explosion_ = new StaticEntity(this->getContext()); 103 103 this->explosion_->setSyncMode(0); 104 104 … … 148 148 this->debrisEntity4_->attach(debris4_); 149 149 150 ParticleSpawner* effect = new ParticleSpawner(this->getC reator());150 ParticleSpawner* effect = new ParticleSpawner(this->getContext()); 151 151 effect->setDestroyAfterLife(true); 152 152 effect->setSource("Orxonox/explosion2b"); … … 154 154 effect->setSyncMode(0); 155 155 156 ParticleSpawner* effect2 = new ParticleSpawner(this->getC reator());156 ParticleSpawner* effect2 = new ParticleSpawner(this->getContext()); 157 157 effect2->setDestroyAfterLife(true); 158 158 effect2->setSource("Orxonox/smoke6"); … … 172 172 for(int i=0;i<10;i++) 173 173 { 174 Model* part1 = new Model(this );175 Model* part2 = new Model(this );176 177 MovableEntity* partEntity1 = new MovableEntity(this );178 MovableEntity* partEntity2 = new MovableEntity(this );174 Model* part1 = new Model(this->getContext()); 175 Model* part2 = new Model(this->getContext()); 176 177 MovableEntity* partEntity1 = new MovableEntity(this->getContext()); 178 MovableEntity* partEntity2 = new MovableEntity(this->getContext()); 179 179 180 180 part1->setSyncMode(0); -
code/branches/core6/src/orxonox/worldentities/BigExplosion.h
r7176 r9629 40 40 { 41 41 public: 42 BigExplosion( BaseObject* creator);42 BigExplosion(Context* context); 43 43 virtual ~BigExplosion(); 44 44 -
code/branches/core6/src/orxonox/worldentities/CameraPosition.cc
r8706 r9629 37 37 CreateFactory(CameraPosition); 38 38 39 CameraPosition::CameraPosition( BaseObject* creator) : StaticEntity(creator)39 CameraPosition::CameraPosition(Context* context) : StaticEntity(context) 40 40 { 41 41 RegisterObject(CameraPosition); -
code/branches/core6/src/orxonox/worldentities/CameraPosition.h
r5781 r9629 38 38 { 39 39 public: 40 CameraPosition( BaseObject* creator);40 CameraPosition(Context* context); 41 41 virtual ~CameraPosition(); 42 42 -
code/branches/core6/src/orxonox/worldentities/ControllableEntity.cc
r9558 r9629 52 52 registerMemberNetworkFunction( ControllableEntity, setTargetInternal ); 53 53 54 ControllableEntity::ControllableEntity( BaseObject* creator) : MobileEntity(creator)54 ControllableEntity::ControllableEntity(Context* context) : MobileEntity(context) 55 55 { 56 56 RegisterObject(ControllableEntity); … … 397 397 if (!this->camera_ && GameMode::showsGraphics()) 398 398 { 399 this->camera_ = new Camera(this );399 this->camera_ = new Camera(this->getContext()); 400 400 this->camera_->requestFocus(); 401 401 if (!this->cameraPositionTemplate_.empty()) … … 423 423 if (!this->hudtemplate_.empty()) 424 424 { 425 this->hud_ = new OverlayGroup(this );425 this->hud_ = new OverlayGroup(this->getContext()); 426 426 this->hud_->addTemplate(this->hudtemplate_); 427 427 this->hud_->setOwner(this); -
code/branches/core6/src/orxonox/worldentities/ControllableEntity.h
r9348 r9629 44 44 45 45 public: 46 ControllableEntity( BaseObject* creator);46 ControllableEntity(Context* context); 47 47 virtual ~ControllableEntity(); 48 48 -
code/branches/core6/src/orxonox/worldentities/Drone.cc
r7163 r9629 39 39 Constructor. Registers the object and initializes some default values. 40 40 */ 41 Drone::Drone( BaseObject* creator) : Pawn(creator)41 Drone::Drone(Context* context) : Pawn(context) 42 42 { 43 43 RegisterObject(Drone); … … 50 50 this->setCollisionType(WorldEntity::Dynamic); 51 51 52 myController_ = new DroneController( static_cast<BaseObject*>(this)); //!< Creates a new controller and passes our this pointer to it as creator.52 myController_ = new DroneController(this->getContext()); //!< Creates a new controller and passes our this pointer to it as creator. 53 53 myController_->setDrone(this); 54 54 -
code/branches/core6/src/orxonox/worldentities/Drone.h
r7163 r9629 47 47 { 48 48 public: 49 Drone( BaseObject* creator);49 Drone(Context* context); 50 50 virtual ~Drone(); 51 51 -
code/branches/core6/src/orxonox/worldentities/EffectContainer.cc
r6417 r9629 42 42 CreateFactory(EffectContainer); 43 43 44 EffectContainer::EffectContainer( BaseObject* creator)45 : BaseObject(c reator)44 EffectContainer::EffectContainer(Context* context) 45 : BaseObject(context) 46 46 , lua_(NULL) 47 47 { -
code/branches/core6/src/orxonox/worldentities/EffectContainer.h
r6417 r9629 40 40 { 41 41 public: 42 EffectContainer( BaseObject* creator);42 EffectContainer(Context* context); 43 43 virtual ~EffectContainer(); 44 44 -
code/branches/core6/src/orxonox/worldentities/ExplosionChunk.cc
r9589 r9629 40 40 CreateFactory(ExplosionChunk); 41 41 42 ExplosionChunk::ExplosionChunk( BaseObject* creator) : MovableEntity(creator)42 ExplosionChunk::ExplosionChunk(Context* context) : MovableEntity(context) 43 43 { 44 44 RegisterObject(ExplosionChunk); -
code/branches/core6/src/orxonox/worldentities/ExplosionChunk.h
r7163 r9629 40 40 { 41 41 public: 42 ExplosionChunk( BaseObject* creator);42 ExplosionChunk(Context* context); 43 43 virtual ~ExplosionChunk(); 44 44 -
code/branches/core6/src/orxonox/worldentities/MobileEntity.cc
r8858 r9629 39 39 namespace orxonox 40 40 { 41 MobileEntity::MobileEntity( BaseObject* creator) : WorldEntity(creator)41 MobileEntity::MobileEntity(Context* context) : WorldEntity(context) 42 42 { 43 43 RegisterObject(MobileEntity); -
code/branches/core6/src/orxonox/worldentities/MobileEntity.h
r8727 r9629 41 41 { 42 42 public: 43 MobileEntity( BaseObject* creator);43 MobileEntity(Context* context); 44 44 virtual ~MobileEntity(); 45 45 -
code/branches/core6/src/orxonox/worldentities/MovableEntity.cc
r7284 r9629 43 43 CreateFactory(MovableEntity); 44 44 45 MovableEntity::MovableEntity( BaseObject* creator) : MobileEntity(creator)45 MovableEntity::MovableEntity(Context* context) : MobileEntity(context) 46 46 { 47 47 RegisterObject(MovableEntity); -
code/branches/core6/src/orxonox/worldentities/MovableEntity.h
r7163 r9629 43 43 { 44 44 public: 45 MovableEntity( BaseObject* creator);45 MovableEntity(Context* context); 46 46 virtual ~MovableEntity(); 47 47 -
code/branches/core6/src/orxonox/worldentities/SpawnPoint.cc
r8858 r9629 39 39 CreateFactory(SpawnPoint); 40 40 41 SpawnPoint::SpawnPoint( BaseObject* creator) : StaticEntity(creator)41 SpawnPoint::SpawnPoint(Context* context) : StaticEntity(context) 42 42 { 43 43 RegisterObject(SpawnPoint); … … 81 81 Pawn* SpawnPoint::spawn() 82 82 { 83 Pawn* entity = this->spawnclass_.fabricate(this );83 Pawn* entity = this->spawnclass_.fabricate(this->getContext()); 84 84 if (entity) 85 85 { -
code/branches/core6/src/orxonox/worldentities/SpawnPoint.h
r9563 r9629 41 41 { 42 42 public: 43 SpawnPoint( BaseObject* creator);43 SpawnPoint(Context* context); 44 44 virtual ~SpawnPoint() {} 45 45 -
code/branches/core6/src/orxonox/worldentities/StaticEntity.cc
r8858 r9629 39 39 CreateFactory(StaticEntity); 40 40 41 StaticEntity::StaticEntity( BaseObject* creator) : WorldEntity(creator)41 StaticEntity::StaticEntity(Context* context) : WorldEntity(context) 42 42 { 43 43 RegisterObject(StaticEntity); -
code/branches/core6/src/orxonox/worldentities/StaticEntity.h
r7163 r9629 39 39 { 40 40 public: 41 StaticEntity( BaseObject* creator);41 StaticEntity(Context* context); 42 42 virtual ~StaticEntity(); 43 43 -
code/branches/core6/src/orxonox/worldentities/TeamSpawnPoint.cc
r5781 r9629 36 36 CreateFactory(TeamSpawnPoint); 37 37 38 TeamSpawnPoint::TeamSpawnPoint( BaseObject* creator) : SpawnPoint(creator)38 TeamSpawnPoint::TeamSpawnPoint(Context* context) : SpawnPoint(context) 39 39 { 40 40 RegisterObject(TeamSpawnPoint); -
code/branches/core6/src/orxonox/worldentities/TeamSpawnPoint.h
r5781 r9629 40 40 { 41 41 public: 42 TeamSpawnPoint( BaseObject* creator);42 TeamSpawnPoint(Context* context); 43 43 virtual ~TeamSpawnPoint() {} 44 44 -
code/branches/core6/src/orxonox/worldentities/WorldEntity.cc
r9612 r9629 66 66 All the default values are being set here. 67 67 */ 68 WorldEntity::WorldEntity( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)68 WorldEntity::WorldEntity(Context* context) : BaseObject(context), Synchronisable(context) 69 69 { 70 70 RegisterObject(WorldEntity); … … 92 92 this->bPhysicsActiveSynchronised_ = false; 93 93 this->bPhysicsActiveBeforeAttaching_ = false; 94 this->collisionShape_ = new WorldEntityCollisionShape(this );94 this->collisionShape_ = new WorldEntityCollisionShape(this->getContext()); 95 95 this->collisionShape_->setWorldEntityOwner(this); 96 96 this->collisionType_ = None; -
code/branches/core6/src/orxonox/worldentities/WorldEntity.h
r7910 r9629 90 90 91 91 public: 92 WorldEntity( BaseObject* creator);92 WorldEntity(Context* context); 93 93 virtual ~WorldEntity(); 94 94 -
code/branches/core6/src/orxonox/worldentities/pawns/Destroyer.cc
r5929 r9629 36 36 CreateFactory(Destroyer); 37 37 38 Destroyer::Destroyer( BaseObject* creator) : SpaceShip(creator)38 Destroyer::Destroyer(Context* context) : SpaceShip(context) 39 39 { 40 40 RegisterObject(Destroyer); -
code/branches/core6/src/orxonox/worldentities/pawns/Destroyer.h
r5781 r9629 39 39 { 40 40 public: 41 Destroyer( BaseObject* creator);41 Destroyer(Context* context); 42 42 virtual ~Destroyer() {}; 43 43 -
code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.cc
r9558 r9629 55 55 CreateFactory(FpsPlayer); 56 56 57 FpsPlayer::FpsPlayer( BaseObject* creator) : Pawn(creator)57 FpsPlayer::FpsPlayer(Context* context) : Pawn(context) 58 58 { 59 59 RegisterObject(FpsPlayer); -
code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.h
r9016 r9629 43 43 { 44 44 public: 45 FpsPlayer( BaseObject* creator);45 FpsPlayer(Context* context); 46 46 virtual ~FpsPlayer(); 47 47 -
code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc
r9554 r9629 51 51 CreateFactory(Pawn); 52 52 53 Pawn::Pawn( BaseObject* creator)54 : ControllableEntity(c reator)55 , RadarViewable( creator, static_cast<WorldEntity*>(this))53 Pawn::Pawn(Context* context) 54 : ControllableEntity(context) 55 , RadarViewable(this, static_cast<WorldEntity*>(this)) 56 56 { 57 57 RegisterObject(Pawn); … … 84 84 if (GameMode::isMaster()) 85 85 { 86 this->weaponSystem_ = new WeaponSystem(this );86 this->weaponSystem_ = new WeaponSystem(this->getContext()); 87 87 this->weaponSystem_->setPawn(this); 88 88 } … … 297 297 if (!this->spawnparticlesource_.empty()) 298 298 { 299 ParticleSpawner* effect = new ParticleSpawner(this->getC reator());299 ParticleSpawner* effect = new ParticleSpawner(this->getContext()); 300 300 effect->setPosition(this->getPosition()); 301 301 effect->setOrientation(this->getOrientation()); … … 334 334 this->setDestroyWhenPlayerLeft(false); 335 335 336 BigExplosion* chunk = new BigExplosion(this->getC reator());336 BigExplosion* chunk = new BigExplosion(this->getContext()); 337 337 chunk->setPosition(this->getPosition()); 338 338 … … 342 342 // play death effect 343 343 { 344 ParticleSpawner* effect = new ParticleSpawner(this->getC reator());344 ParticleSpawner* effect = new ParticleSpawner(this->getContext()); 345 345 effect->setPosition(this->getPosition()); 346 346 effect->setOrientation(this->getOrientation()); … … 350 350 } 351 351 { 352 ParticleSpawner* effect = new ParticleSpawner(this->getC reator());352 ParticleSpawner* effect = new ParticleSpawner(this->getContext()); 353 353 effect->setPosition(this->getPosition()); 354 354 effect->setOrientation(this->getOrientation()); … … 358 358 } 359 359 { 360 ParticleSpawner* effect = new ParticleSpawner(this->getC reator());360 ParticleSpawner* effect = new ParticleSpawner(this->getContext()); 361 361 effect->setPosition(this->getPosition()); 362 362 effect->setOrientation(this->getOrientation()); … … 367 367 for (unsigned int i = 0; i < this->numexplosionchunks_; ++i) 368 368 { 369 ExplosionChunk* chunk = new ExplosionChunk(this->getC reator());369 ExplosionChunk* chunk = new ExplosionChunk(this->getContext()); 370 370 chunk->setPosition(this->getPosition()); 371 371 } -
code/branches/core6/src/orxonox/worldentities/pawns/Pawn.h
r9348 r9629 45 45 46 46 public: 47 Pawn( BaseObject* creator);47 Pawn(Context* context); 48 48 virtual ~Pawn(); 49 49 -
code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc
r9589 r9629 48 48 CreateFactory(SpaceShip); 49 49 50 SpaceShip::SpaceShip( BaseObject* creator) : Pawn(creator), boostBlur_(NULL)50 SpaceShip::SpaceShip(Context* context) : Pawn(context), boostBlur_(NULL) 51 51 { 52 52 RegisterObject(SpaceShip); -
code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.h
r8727 r9629 88 88 { 89 89 public: 90 SpaceShip( BaseObject* creator);90 SpaceShip(Context* context); 91 91 virtual ~SpaceShip(); 92 92 -
code/branches/core6/src/orxonox/worldentities/pawns/Spectator.cc
r9558 r9629 47 47 CreateFactory(Spectator); 48 48 49 Spectator::Spectator( BaseObject* creator) : ControllableEntity(creator)49 Spectator::Spectator(Context* context) : ControllableEntity(context) 50 50 { 51 51 RegisterObject(Spectator); -
code/branches/core6/src/orxonox/worldentities/pawns/Spectator.h
r7862 r9629 40 40 { 41 41 public: 42 Spectator( BaseObject* creator);42 Spectator(Context* context); 43 43 virtual ~Spectator(); 44 44 -
code/branches/core6/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc
r5929 r9629 39 39 CreateFactory(TeamBaseMatchBase); 40 40 41 TeamBaseMatchBase::TeamBaseMatchBase( BaseObject* creator) : Pawn(creator)41 TeamBaseMatchBase::TeamBaseMatchBase(Context* context) : Pawn(context) 42 42 { 43 43 RegisterObject(TeamBaseMatchBase); -
code/branches/core6/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h
r5781 r9629 50 50 { 51 51 public: 52 TeamBaseMatchBase( BaseObject* creator);52 TeamBaseMatchBase(Context* context); 53 53 54 54 // if class closes, close everything -
code/branches/core6/test/core/class/SubclassIdentifierTest.cc
r9601 r9629 12 12 { 13 13 public: 14 TestClass( BaseObject* creator= NULL) { RegisterRootObject(TestClass); }14 TestClass(Context* context = NULL) { RegisterRootObject(TestClass); } 15 15 }; 16 16 … … 18 18 { 19 19 public: 20 TestSubclass( BaseObject* creator= NULL) { RegisterObject(TestSubclass); }20 TestSubclass(Context* context = NULL) { RegisterObject(TestSubclass); } 21 21 }; 22 22 -
code/branches/core6/test/core/class/SuperTest.cc
r9601 r9629 13 13 { 14 14 public: 15 TestClass( BaseObject* creator = NULL) : BaseObject(NULL), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP)15 TestClass(Context* context = NULL) : BaseObject(context), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP) 16 16 { 17 17 RegisterRootObject(TestClass); … … 37 37 { 38 38 public: 39 TestSubclass( BaseObject* creator = NULL) :changedNameSubclass_(false), xmlPortSubclass_(false), modeSubclass_(XMLPort::NOP)39 TestSubclass(Context* context = NULL) : TestClass(context), changedNameSubclass_(false), xmlPortSubclass_(false), modeSubclass_(XMLPort::NOP) 40 40 { 41 41 RegisterObject(TestSubclass); -
code/branches/core6/test/core/object/ContextTest.cc
- Property svn:eol-style set to native
r9610 r9629 11 11 { 12 12 public: 13 SubclassContext() { RegisterRootObject(SubclassContext); }13 SubclassContext() : Context(NULL) { RegisterRootObject(SubclassContext); } 14 14 }; 15 15 } … … 17 17 TEST(ContextTest, CanCreateContext) 18 18 { 19 Context context ;19 Context context(NULL); 20 20 } 21 21 … … 27 27 TEST(ContextTest, ContextIsItsOwnContext) 28 28 { 29 Context context ;29 Context context(NULL); 30 30 EXPECT_EQ(&context, context.getContext()); 31 31 }
Note: See TracChangeset
for help on using the changeset viewer.