Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9629


Ignore:
Timestamp:
Aug 9, 2013, 9:26:46 PM (11 years ago)
Author:
landauf
Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:
code/branches/core6
Files:
454 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core6/src/libraries/core/BaseObject.cc

    r9590 r9629  
    5555        @brief Constructor: Registers the object in the BaseObject-list.
    5656    */
    57     BaseObject::BaseObject(BaseObject* creator) : bInitialized_(false)
     57    BaseObject::BaseObject(Context* context) : bInitialized_(false)
    5858    {
    5959        RegisterRootObject(BaseObject);
    … …  
    7070        this->mainStateFunctor_ = 0;
    7171
     72        if (context)
     73            this->setContext(context);
     74
     75        BaseObject* creator = orxonox_cast<BaseObject*>(context);
    7276        this->setCreator(creator);
    7377        if (this->creator_)
    … …  
    201205        {
    202206            this->networkTemplateNames_.insert(temp->getLink());
    203            
     207
    204208            Template* link;
    205209            assert(!(link = Template::getTemplate(temp->getLink())) || !link->isLink());

  • code/branches/core6/src/libraries/core/BaseObject.h

    r9607 r9629  
    6565
    6666        public:
    67             BaseObject(BaseObject* creator);
     67            BaseObject(Context* context);
    6868            virtual ~BaseObject();
    6969            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

  • code/branches/core6/src/libraries/core/Loader.cc

    r9557 r9629  
    209209
    210210            orxout(verbose, context::loader) << "  creating root-namespace..." << endl;
    211             Namespace* rootNamespace = new Namespace(0);
     211            Namespace* rootNamespace = new Namespace(Context::getRootContext());
    212212            rootNamespace->setLoaderIndentation("    ");
    213213            rootNamespace->setFile(file);

  • code/branches/core6/src/libraries/core/Namespace.cc

    r7401 r9629  
    4040    CreateFactory(Namespace);
    4141
    42     Namespace::Namespace(BaseObject* creator) : BaseObject(creator),
     42    Namespace::Namespace(Context* context) : BaseObject(context), Context(context),
    4343      bAutogeneratedFileRootNamespace_(false),
    4444      bRoot_(false),

  • code/branches/core6/src/libraries/core/Namespace.h

    r7401 r9629  
    4040#include <string>
    4141#include "BaseObject.h"
     42#include "object/Context.h"
    4243
    4344namespace orxonox
    4445{
    45     class Namespace : public BaseObject
     46    class Namespace : public BaseObject, public Context
    4647    {
    4748        public:
    48             Namespace(BaseObject* creator);
     49            Namespace(Context* context);
    4950            virtual ~Namespace();
    5051

  • code/branches/core6/src/libraries/core/Template.cc

    r9564 r9629  
    4040    CreateFactory(Template);
    4141
    42     Template::Template(BaseObject* creator) : BaseObject(creator)
     42    Template::Template(Context* context) : BaseObject(context)
    4343    {
    4444        this->xmlelement_ = new TiXmlElement("");

  • code/branches/core6/src/libraries/core/Template.h

    r7401 r9629  
    5151    {
    5252        public:
    53             Template(BaseObject* creator);
     53            Template(Context* context);
    5454            virtual ~Template();
    5555

  • code/branches/core6/src/libraries/core/XMLPort.cc

    r9564 r9629  
    8989                        orxout(verbose, context::xml) << object->getLoaderIndentation() << "fabricating " << child->Value() << "..." << endl;
    9090
    91                         BaseObject* newObject = orxonox_cast<BaseObject*>(identifier->fabricate(object));
     91                        BaseObject* newObject = orxonox_cast<BaseObject*>(identifier->fabricate(object->getContext()));
    9292                        newObject->setLoaderIndentation(object->getLoaderIndentation() + "  ");
    9393

  • code/branches/core6/src/libraries/core/class/Identifier.cc

    r9606 r9629  
    174174        @return The new object
    175175    */
    176     OrxonoxClass* Identifier::fabricate(BaseObject* creator)
     176    OrxonoxClass* Identifier::fabricate(Context* context)
    177177    {
    178178        if (this->factory_)
    179179        {
    180             return this->factory_->fabricate(creator);
     180            return this->factory_->fabricate(context);
    181181        }
    182182        else

  • code/branches/core6/src/libraries/core/class/Identifier.h

    r9626 r9629  
    125125            inline bool hasFactory() const { return (this->factory_ != 0); }
    126126
    127             OrxonoxClass* fabricate(BaseObject* creator);
     127            OrxonoxClass* fabricate(Context* context);
    128128
    129129            /// Returns true if the class can be loaded through XML.

  • code/branches/core6/src/libraries/core/class/SubclassIdentifier.h

    r9563 r9629  
    163163
    164164            /// 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) const
    166             {
    167                 OrxonoxClass* newObject = this->identifier_->fabricate(creator);
     165            T* fabricate(Context* context) const
     166            {
     167                OrxonoxClass* newObject = this->identifier_->fabricate(context);
    168168
    169169                // Check if the creation was successful

  • code/branches/core6/src/libraries/core/object/ClassFactory.h

    r9602 r9629  
    5555        public:
    5656            virtual ~Factory() {};
    57             virtual OrxonoxClass* fabricate(BaseObject* creator) = 0;
     57            virtual OrxonoxClass* fabricate(Context* context) = 0;
    5858    };
    5959
    … …  
    8282                @return The new object
    8383            */
    84             inline OrxonoxClass* fabricate(BaseObject* creator)
     84            inline OrxonoxClass* fabricate(Context* context)
    8585            {
    86                 return static_cast<OrxonoxClass*>(new T(creator));
     86                return static_cast<OrxonoxClass*>(new T(context));
    8787            }
    8888    };

  • code/branches/core6/src/libraries/core/object/Context.cc

    r9610 r9629  
    5656    /*static*/ Context* Context::getRootContext()
    5757    {
    58         static Context rootContext;
     58        static Context rootContext(NULL);
    5959        return &rootContext;
    6060    }

  • code/branches/core6/src/libraries/core/object/Context.h

    r9610 r9629  
    4848            static Context* getRootContext();
    4949
    50             Context(Context* context = NULL);
     50            Context(Context* context);
    5151            virtual ~Context();
    5252

  • code/branches/core6/src/libraries/network/packet/Gamestate.cc

    r9579 r9629  
    133133    tempsize = it->getData(mem, this->sizes_, id, mode);
    134134    if ( tempsize != 0 )
    135       dataVector_.push_back( obj(it->getObjectID(), it->getCreatorID(), tempsize, mem-data_) );
     135      dataVector_.push_back( obj(it->getObjectID(), it->getContextID(), tempsize, mem-data_) );
    136136
    137137#ifndef NDEBUG
    … …  
    469469    {
    470470      assert( objectHeader.getClassID() == htemp.getClassID() );
    471       assert( objectHeader.getCreatorID() == htemp.getCreatorID() );
     471      assert( objectHeader.getContextID() == htemp.getContextID() );
    472472      return true;
    473473    }

  • code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc

    r9564 r9629  
    4949  * Initializes all Variables and sets the right objectID_
    5050  */
    51   Synchronisable::Synchronisable(BaseObject* creator )
     51  Synchronisable::Synchronisable(Context* context)
    5252  {
    5353    RegisterRootObject(Synchronisable);
    … …  
    6969    this->setPriority( Priority::Normal );
    7070
    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);
    7673  }
    7774
    … …  
    10097  }
    10198
     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  }
    102114
    103115  /**
    … …  
    142154    }
    143155    assert(id);
    144     BaseObject* creator = 0;
    145     if (header.getCreatorID() != OBJECTID_UNKNOWN)
    146     {
    147       Synchronisable* synchronisable_creator = Synchronisable::getSynchronisable(header.getCreatorID());
    148       if (!synchronisable_creator)
     156    Context* context = 0;
     157    if (header.getContextID() != OBJECTID_UNKNOWN)
     158    {
     159      Synchronisable* synchronisable_context = Synchronisable::getSynchronisable(header.getContextID());
     160      if (!synchronisable_context)
    149161      {
    150162        mem += header.getDataSize()+SynchronisableHeader::getSize(); //.TODO: this suckz.... remove size from header
    … …  
    153165      }
    154166      else
    155         creator = orxonox_cast<BaseObject*>(synchronisable_creator);
     167        context = orxonox_cast<Context*>(synchronisable_context);
    156168    }
    157169    assert(getSynchronisable(header.getObjectID())==0);   //make sure no object with this id exists
    158     BaseObject *bo = orxonox_cast<BaseObject*>(id->fabricate(creator));
     170    BaseObject *bo = orxonox_cast<BaseObject*>(id->fabricate(context));
    159171    assert(bo);
    160172    Synchronisable *no = orxonox_cast<Synchronisable*>(bo);
    … …  
    162174    assert( Synchronisable::objectMap_.find(header.getObjectID()) == Synchronisable::objectMap_.end() );
    163175    no->setObjectID(header.getObjectID());
    164     //no->creatorID=header.getCreatorID(); //TODO: remove this
     176    //no->contextID=header.getContextID(); //TODO: remove this
    165177    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    }
    169185    //assert(no->classID_ == header.getClassID());
    170186    orxout(verbose, context::network) << "fabricate objectID_: " << no->objectID_ << " classID_: " << no->classID_ << endl;
    … …  
    274290
    275291    header.setObjectID( this->objectID_ );
    276     header.setCreatorID( this->creatorID_ );
     292    header.setContextID( this->contextID_ );
    277293    header.setClassID( this->classID_ );
    278294    header.setDataSize( tempsize );
    … …  
    331347      SynchronisableHeader syncHeader2(mem);
    332348      assert( this->getClassID() == syncHeader2.getClassID() );
    333       assert( this->getCreatorID() == syncHeader2.getCreatorID() );
     349      assert( this->getContextID() == syncHeader2.getContextID() );
    334350      mem += SynchronisableHeader::getSize();
    335351      std::vector<SynchronisableVariableBase *>::iterator i;

  • code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h

    r9587 r9629  
    107107   * @brief: stores information about a Synchronisable
    108108   *
    109    * This class stores the information about a Synchronisable (objectID_, classID_, creatorID_, dataSize)
     109   * This class stores the information about a Synchronisable (objectID_, classID_, contextID_, dataSize)
    110110   * in an emulated bitset.
    111111   * Bit 1 to 31 store the size of the Data the synchronisable consumes in the stream
    … …  
    113113   * Byte 5 to 8: objectID_
    114114   * Byte 9 to 12: classID_
    115    * Byte 13 to 16: creatorID_
     115   * Byte 13 to 16: contextID_
    116116   */
    117117  class _NetworkExport SynchronisableHeader: public SynchronisableHeaderLight
    … …  
    126126      inline void setClassID(uint32_t classID_)
    127127        { *(uint32_t*)(data_+SynchronisableHeaderLight::getSize()) = classID_; }
    128       inline uint32_t getCreatorID() const
     128      inline uint32_t getContextID() const
    129129        { return *(uint32_t*)(data_+SynchronisableHeaderLight::getSize()+4); }
    130       inline void setCreatorID(uint32_t creatorID_)
    131         { *(uint32_t*)(data_+SynchronisableHeaderLight::getSize()+4) = creatorID_; }
     130      inline void setContextID(uint32_t contextID_)
     131        { *(uint32_t*)(data_+SynchronisableHeaderLight::getSize()+4) = contextID_; }
    132132      inline void operator=(SynchronisableHeader& h)
    133133        { memcpy(data_, h.data_, getSize()); }
    … …  
    158158
    159159    inline uint32_t getObjectID() const {return this->objectID_;}
    160     inline unsigned int getCreatorID() const {return this->creatorID_;}
     160    inline unsigned int getContextID() const {return this->contextID_;}
    161161    inline uint32_t getClassID() const {return this->classID_;}
    162162    inline unsigned int getPriority() const { return this->objectFrequency_;}
    … …  
    170170
    171171  protected:
    172     Synchronisable(BaseObject* creator);
     172    Synchronisable(Context* context);
    173173    template <class T> void registerVariable(T& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false);
    174174    template <class T> void registerVariable(std::set<T>& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false);
    … …  
    176176
    177177    void setPriority(unsigned int freq){ objectFrequency_ = freq; }
    178 
     178    uint32_t findContextID(Context* context);
    179179
    180180  private:
    … …  
    189189
    190190    uint32_t objectID_;
    191     uint32_t creatorID_;
     191    uint32_t contextID_;
    192192    uint32_t classID_;
    193193

  • code/branches/core6/src/libraries/tools/ResourceCollection.cc

    r8858 r9629  
    3939    CreateFactory(ResourceCollection);
    4040
    41     ResourceCollection::ResourceCollection(BaseObject* creator)
    42         : BaseObject(creator)
     41    ResourceCollection::ResourceCollection(Context* context)
     42        : BaseObject(context)
    4343    {
    4444        RegisterObject(ResourceCollection);

  • code/branches/core6/src/libraries/tools/ResourceCollection.h

    r7401 r9629  
    4141    {
    4242    public:
    43         ResourceCollection(BaseObject* creator);
     43        ResourceCollection(Context* context);
    4444        virtual ~ResourceCollection();
    4545

  • code/branches/core6/src/libraries/tools/ResourceLocation.cc

    r8858 r9629  
    4343    CreateFactory(ResourceLocation);
    4444
    45     ResourceLocation::ResourceLocation(BaseObject* creator)
    46         : BaseObject(creator)
     45    ResourceLocation::ResourceLocation(Context* context)
     46        : BaseObject(context)
    4747    {
    4848        RegisterObject(ResourceLocation);

  • code/branches/core6/src/libraries/tools/ResourceLocation.h

    r7401 r9629  
    4343
    4444    public:
    45         ResourceLocation(BaseObject* creator);
     45        ResourceLocation(Context* context);
    4646        virtual ~ResourceLocation();
    4747

  • code/branches/core6/src/modules/designtools/CreateStars.cc

    r8351 r9629  
    3939    CreateFactory(CreateStars);
    4040
    41     CreateStars::CreateStars(BaseObject* creator) : BaseObject(creator)
     41    CreateStars::CreateStars(Context* context) : BaseObject(context)
    4242    {
    4343        RegisterObject(CreateStars);
    … …  
    6969        for(int i=0; i < numStars_; i++)
    7070        {
    71             Billboard* bb = new Billboard(this);
     71            Billboard* bb = new Billboard(this->getContext());
    7272
    7373            float r = rnd(-colourDiff_,colourDiff_);

  • code/branches/core6/src/modules/designtools/CreateStars.h

    r7163 r9629  
    3838    {
    3939        public:
    40             CreateStars(orxonox::BaseObject* creator);
     40            CreateStars(Context* context);
    4141            virtual ~CreateStars();
    4242

  • code/branches/core6/src/modules/docking/Dock.cc

    r8858 r9629  
    5353    registerStaticNetworkFunction(Dock::showDockingDialog);
    5454
    55     Dock::Dock(BaseObject* creator) : StaticEntity(creator)
     55    Dock::Dock(Context* context) : StaticEntity(context)
    5656    {
    5757        RegisterObject(Dock);

  • code/branches/core6/src/modules/docking/Dock.h

    r9579 r9629  
    5757    { // tolua_export
    5858        public:
    59             Dock(BaseObject* creator);
     59            Dock(Context* context);
    6060            virtual ~Dock();
    6161

  • code/branches/core6/src/modules/docking/DockToShip.cc

    r8858 r9629  
    4040    CreateFactory(DockToShip);
    4141
    42     DockToShip::DockToShip(BaseObject* creator) : DockingEffect(creator)
     42    DockToShip::DockToShip(Context* context) : DockingEffect(context)
    4343    {
    4444        RegisterObject(DockToShip);

  • code/branches/core6/src/modules/docking/DockToShip.h

    r8706 r9629  
    5757    {
    5858        public:
    59             DockToShip(BaseObject* creator);
     59            DockToShip(Context* context);
    6060            virtual ~DockToShip();
    6161

  • code/branches/core6/src/modules/docking/DockingAnimation.cc

    r9579 r9629  
    3939namespace orxonox
    4040{
    41     DockingAnimation::DockingAnimation(BaseObject* creator) : BaseObject(creator)
     41    DockingAnimation::DockingAnimation(Context* context) : BaseObject(context)
    4242    {
    4343        RegisterObject(DockingAnimation);

  • code/branches/core6/src/modules/docking/DockingAnimation.h

    r9579 r9629  
    6363    {
    6464        public:
    65             DockingAnimation(BaseObject* creator);
     65            DockingAnimation(Context* context);
    6666            virtual ~DockingAnimation();
    6767

  • code/branches/core6/src/modules/docking/DockingController.cc

    r9579 r9629  
    4040    CreateFactory(DockingController);
    4141
    42     DockingController::DockingController(BaseObject* creator) : ArtificialController(creator)
     42    DockingController::DockingController(Context* context) : ArtificialController(context)
    4343    {
    4444        RegisterObject(DockingController);

  • code/branches/core6/src/modules/docking/DockingController.h

    r8706 r9629  
    4242    {
    4343        public:
    44             DockingController(BaseObject* creator);
     44            DockingController(Context* context);
    4545            virtual ~DockingController();
    4646

  • code/branches/core6/src/modules/docking/DockingEffect.cc

    r9579 r9629  
    3737namespace orxonox
    3838{
    39     DockingEffect::DockingEffect(BaseObject* creator) : BaseObject(creator)
     39    DockingEffect::DockingEffect(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(DockingEffect);

  • code/branches/core6/src/modules/docking/DockingEffect.h

    r9579 r9629  
    6161    {
    6262        public:
    63             DockingEffect(BaseObject* creator);
     63            DockingEffect(Context* context);
    6464            virtual ~DockingEffect();
    6565

  • code/branches/core6/src/modules/docking/DockingTarget.cc

    r9579 r9629  
    4141    CreateFactory(DockingTarget);
    4242
    43     DockingTarget::DockingTarget(BaseObject* creator) : StaticEntity(creator)
     43    DockingTarget::DockingTarget(Context* context) : StaticEntity(context)
    4444    {
    4545        RegisterObject(DockingTarget);

  • code/branches/core6/src/modules/docking/DockingTarget.h

    r8706 r9629  
    5555    {
    5656        public:
    57             DockingTarget(BaseObject* creator);
     57            DockingTarget(Context* context);
    5858            virtual ~DockingTarget();
    5959

  • code/branches/core6/src/modules/docking/MoveToDockingTarget.cc

    r9579 r9629  
    4242    CreateFactory(MoveToDockingTarget);
    4343
    44     MoveToDockingTarget::MoveToDockingTarget(BaseObject *creator) : DockingAnimation(creator)
     44    MoveToDockingTarget::MoveToDockingTarget(Context* context) : DockingAnimation(context)
    4545    {
    4646        RegisterObject(MoveToDockingTarget);
    … …  
    5555        assert(this->parent_);
    5656
    57         DockingController *dockingController = new DockingController(this);
     57        DockingController *dockingController = new DockingController(this->getContext());
    5858        dockingController->setDock(this->parent_);
    5959        dockingController->setPlayer(player);

  • code/branches/core6/src/modules/docking/MoveToDockingTarget.h

    r8706 r9629  
    5656    {
    5757        public:
    58             MoveToDockingTarget(BaseObject* creator);
     58            MoveToDockingTarget(Context* context);
    5959            virtual ~MoveToDockingTarget();
    6060

  • code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.cc

    r9348 r9629  
    4040    CreateFactory(OldRaceCheckPoint);
    4141
    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))
    4343    {
    4444        RegisterObject(OldRaceCheckPoint);

  • code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.h

    r9348 r9629  
    4545    {
    4646        public:
    47             OldRaceCheckPoint(BaseObject* creator);
     47            OldRaceCheckPoint(Context* context);
    4848            virtual ~OldRaceCheckPoint();
    4949

  • code/branches/core6/src/modules/gametypes/OldSpaceRace.cc

    r9348 r9629  
    3838    CreateUnloadableFactory(OldSpaceRace);
    3939
    40     OldSpaceRace::OldSpaceRace(BaseObject* creator) : Gametype(creator)
     40    OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context)
    4141    {
    4242        RegisterObject(OldSpaceRace);

  • code/branches/core6/src/modules/gametypes/OldSpaceRace.h

    r9348 r9629  
    5252
    5353        public:
    54             OldSpaceRace(BaseObject* creator);
     54            OldSpaceRace(Context* context);
    5555            virtual ~OldSpaceRace() {}
    5656

  • code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc

    r9554 r9629  
    4343    CreateFactory(RaceCheckPoint);
    4444
    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))
    4747    {
    4848        RegisterObject(RaceCheckPoint);

  • code/branches/core6/src/modules/gametypes/RaceCheckPoint.h

    r9554 r9629  
    4545    {
    4646        public:
    47             RaceCheckPoint(BaseObject* creator);
     47            RaceCheckPoint(Context* context);
    4848            virtual ~RaceCheckPoint();
    4949

  • code/branches/core6/src/modules/gametypes/SpaceRace.cc

    r9526 r9629  
    4242    CreateUnloadableFactory(SpaceRace);
    4343
    44     SpaceRace::SpaceRace(BaseObject* creator) : Gametype(creator)
     44    SpaceRace::SpaceRace(Context* context) : Gametype(context)
    4545    {
    4646        RegisterObject(SpaceRace);

  • code/branches/core6/src/modules/gametypes/SpaceRace.h

    r9263 r9629  
    5454
    5555        public:
    56             SpaceRace(BaseObject* creator);
     56            SpaceRace(Context* context);
    5757            virtual ~SpaceRace() {}
    5858

  • code/branches/core6/src/modules/gametypes/SpaceRaceBot.cc

    r9526 r9629  
    3131    CreateFactory(SpaceRaceBot);
    3232
    33     SpaceRaceBot::SpaceRaceBot(BaseObject* creator) : Bot(creator){
     33    SpaceRaceBot::SpaceRaceBot(Context* context) : Bot(context){
    3434        RegisterObject(SpaceRaceBot);
    3535        this->defaultController_ = Class(SpaceRaceController);// ClassByString("")

  • code/branches/core6/src/modules/gametypes/SpaceRaceBot.h

    r9526 r9629  
    4141    {
    4242        public:
    43         SpaceRaceBot(BaseObject* creator);
     43        SpaceRaceBot(Context* context);
    4444            virtual ~SpaceRaceBot() {}
    4545    };

  • code/branches/core6/src/modules/gametypes/SpaceRaceController.cc

    r9554 r9629  
    5252     * Idea: Find static Point (checkpoints the spaceship has to reach)
    5353     */
    54     SpaceRaceController::SpaceRaceController(BaseObject* creator) :
    55         ArtificialController(creator)
     54    SpaceRaceController::SpaceRaceController(Context* context) :
     55        ArtificialController(context)
    5656    {
    5757        RegisterObject(SpaceRaceController)

  • code/branches/core6/src/modules/gametypes/SpaceRaceController.h

    r9526 r9629  
    6565
    6666        public:
    67             SpaceRaceController(BaseObject* creator);
     67            SpaceRaceController(Context* context);
    6868            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    6969            virtual ~SpaceRaceController();

  • code/branches/core6/src/modules/gametypes/SpaceRaceManager.cc

    r9526 r9629  
    4242    CreateFactory(SpaceRaceManager);
    4343
    44     SpaceRaceManager::SpaceRaceManager(BaseObject* creator) :
    45         BaseObject(creator)
     44    SpaceRaceManager::SpaceRaceManager(Context* context) :
     45        BaseObject(context)
    4646    {
    4747        RegisterObject(SpaceRaceManager);

  • code/branches/core6/src/modules/gametypes/SpaceRaceManager.h

    r9526 r9629  
    5555
    5656        public:
    57             SpaceRaceManager(BaseObject* creator);
     57            SpaceRaceManager(Context* context);
    5858            virtual ~SpaceRaceManager() ;
    5959

  • code/branches/core6/src/modules/notifications/NotificationDispatcher.cc

    r8891 r9629  
    5757        Default constructor. Initializes the object.
    5858    */
    59     NotificationDispatcher::NotificationDispatcher(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     59    NotificationDispatcher::NotificationDispatcher(Context* context) : BaseObject(context), Synchronisable(context)
    6060    {
    6161        RegisterObject(NotificationDispatcher);

  • code/branches/core6/src/modules/notifications/NotificationDispatcher.h

    r8891 r9629  
    7676    {
    7777        public:
    78             NotificationDispatcher(BaseObject* creator); //!< Default constructor. Initializes the object.
     78            NotificationDispatcher(Context* context); //!< Default constructor. Initializes the object.
    7979            virtual ~NotificationDispatcher(); //!< Destructor.
    8080

  • code/branches/core6/src/modules/notifications/NotificationQueue.cc

    r9253 r9629  
    5252        The creator of the NotificationQueue.
    5353    */
    54     NotificationQueue::NotificationQueue(BaseObject* creator) : BaseObject(creator), Synchronisable(creator), registered_(false)
     54    NotificationQueue::NotificationQueue(Context* context) : BaseObject(context), Synchronisable(context), registered_(false)
    5555    {
    5656        RegisterObject(NotificationQueue);

  • code/branches/core6/src/modules/notifications/NotificationQueue.h

    r8706 r9629  
    9494
    9595        public:
    96             NotificationQueue(BaseObject* creator);
     96            NotificationQueue(Context* context);
    9797            virtual ~NotificationQueue();
    9898

  • code/branches/core6/src/modules/notifications/NotificationQueueCEGUI.cc

    r8858 r9629  
    5050    /*static*/ const std::string NotificationQueueCEGUI::NOTIFICATION_LAYER("NotificationLayer");
    5151
    52     NotificationQueueCEGUI::NotificationQueueCEGUI(BaseObject* creator) : NotificationQueue(creator)
     52    NotificationQueueCEGUI::NotificationQueueCEGUI(Context* context) : NotificationQueue(context)
    5353    {
    5454        RegisterObject(NotificationQueueCEGUI);

  • code/branches/core6/src/modules/notifications/NotificationQueueCEGUI.h

    r8706 r9629  
    7070
    7171        public:
    72             NotificationQueueCEGUI(BaseObject* creator);
     72            NotificationQueueCEGUI(Context* context);
    7373            virtual ~NotificationQueueCEGUI();
    7474

  • code/branches/core6/src/modules/notifications/dispatchers/CommandNotification.cc

    r9550 r9629  
    5050        Default Constructor. Registers the object and initializes variables.
    5151    */
    52     CommandNotification::CommandNotification(BaseObject* creator) : NotificationDispatcher(creator)
     52    CommandNotification::CommandNotification(Context* context) : NotificationDispatcher(context)
    5353    {
    5454        RegisterObject(CommandNotification);

  • code/branches/core6/src/modules/notifications/dispatchers/CommandNotification.h

    r7552 r9629  
    7070
    7171        public:
    72             CommandNotification(BaseObject* creator); //!< Default Constructor.
     72            CommandNotification(Context* context); //!< Default Constructor.
    7373            virtual ~CommandNotification(); //!< Destructor.
    7474

  • code/branches/core6/src/modules/notifications/dispatchers/SimpleNotification.cc

    r8706 r9629  
    4545        Default Constructor. Registers the object and initializes variables.
    4646    */
    47     SimpleNotification::SimpleNotification(BaseObject* creator) : NotificationDispatcher(creator)
     47    SimpleNotification::SimpleNotification(Context* context) : NotificationDispatcher(context)
    4848    {
    4949        RegisterObject(SimpleNotification);

  • code/branches/core6/src/modules/notifications/dispatchers/SimpleNotification.h

    r7552 r9629  
    6767    {
    6868        public:
    69             SimpleNotification(BaseObject* creator); //!< Default Constructor.
     69            SimpleNotification(Context* context); //!< Default Constructor.
    7070            virtual ~SimpleNotification(); //!< Destructor.
    7171

  • code/branches/core6/src/modules/objects/Attacher.cc

    r6417 r9629  
    3636    CreateFactory(Attacher);
    3737
    38     Attacher::Attacher(BaseObject* creator) : StaticEntity(creator)
     38    Attacher::Attacher(Context* context) : StaticEntity(context)
    3939    {
    4040        RegisterObject(Attacher);

  • code/branches/core6/src/modules/objects/Attacher.h

    r7601 r9629  
    4848    {
    4949        public:
    50             Attacher(BaseObject* creator);
     50            Attacher(Context* context);
    5151            virtual ~Attacher() {}
    5252

  • code/branches/core6/src/modules/objects/ForceField.cc

    r8858 r9629  
    5353        Constructor. Registers the object and initializes some values.
    5454    */
    55     ForceField::ForceField(BaseObject* creator) : StaticEntity(creator)
     55    ForceField::ForceField(Context* context) : StaticEntity(context)
    5656    {
    5757        RegisterObject(ForceField);

  • code/branches/core6/src/modules/objects/ForceField.h

    r8397 r9629  
    8686    {
    8787        public:
    88             ForceField(BaseObject* creator);
     88            ForceField(Context* context);
    8989            virtual ~ForceField();
    9090

  • code/branches/core6/src/modules/objects/Planet.cc

    r8858 r9629  
    4747     * @brief Constructor
    4848     */
    49     Planet::Planet(BaseObject* creator) : MovableEntity(creator)
     49    Planet::Planet(Context* context) : MovableEntity(context)
    5050    {
    5151        RegisterObject(Planet);

  • code/branches/core6/src/modules/objects/Planet.h

    r7601 r9629  
    4848    {
    4949        public:
    50             Planet(BaseObject* creator);
     50            Planet(Context* context);
    5151
    5252            virtual ~Planet();

  • code/branches/core6/src/modules/objects/Script.cc

    r8858 r9629  
    6161        The creator of this object.
    6262    */
    63     Script::Script(BaseObject* creator) : BaseObject(creator)
     63    Script::Script(Context* context) : BaseObject(context)
    6464    {
    6565        RegisterObject(Script);

  • code/branches/core6/src/modules/objects/Script.h

    r7601 r9629  
    9595    {
    9696        public:
    97             Script(BaseObject* creator);
     97            Script(Context* context);
    9898            virtual ~Script();
    9999

  • code/branches/core6/src/modules/objects/SpaceBoundaries.cc

    r9600 r9629  
    4444    CreateFactory(SpaceBoundaries);
    4545
    46     SpaceBoundaries::SpaceBoundaries(BaseObject* creator) : StaticEntity(creator)
     46    SpaceBoundaries::SpaceBoundaries(Context* context) : StaticEntity(context)
    4747    {
    4848        RegisterObject(SpaceBoundaries);
    … …  
    104104        if (current == this->billboards_.size())
    105105        {
    106             Billboard* billboard = new Billboard(this);
     106            Billboard* billboard = new Billboard(this->getContext());
    107107            billboard->setPosition(position);
    108108            billboard->setSyncMode(ObjectDirection::None);

  • code/branches/core6/src/modules/objects/SpaceBoundaries.h

    r9579 r9629  
    7575    {
    7676        public:
    77             SpaceBoundaries(BaseObject* creator);
     77            SpaceBoundaries(Context* context);
    7878            ~SpaceBoundaries();
    7979

  • code/branches/core6/src/modules/objects/Turret.cc

    r9526 r9629  
    4040     * @brief Constructor
    4141     */
    42     Turret::Turret(BaseObject* creator) : SpaceShip(creator)
     42    Turret::Turret(Context* context) : SpaceShip(context)
    4343    {
    4444        RegisterObject(Turret);
    45         this->controller_ = new WaypointPatrolController(this);
     45        this->controller_ = new WaypointPatrolController(this->getContext());
    4646    }
    4747

  • code/branches/core6/src/modules/objects/Turret.h

    r9526 r9629  
    4545    {
    4646        public:
    47             Turret(BaseObject* creator);
     47            Turret(Context* context);
    4848            virtual ~Turret();
    4949

  • code/branches/core6/src/modules/objects/collisionshapes/BoxCollisionShape.cc

    r8858 r9629  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     BoxCollisionShape::BoxCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    BoxCollisionShape::BoxCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(BoxCollisionShape);

  • code/branches/core6/src/modules/objects/collisionshapes/BoxCollisionShape.h

    r8706 r9629  
    5757    {
    5858        public:
    59             BoxCollisionShape(BaseObject* creator);
     59            BoxCollisionShape(Context* context);
    6060            virtual ~BoxCollisionShape();
    6161

  • code/branches/core6/src/modules/objects/collisionshapes/ConeCollisionShape.cc

    r8858 r9629  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     ConeCollisionShape::ConeCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    ConeCollisionShape::ConeCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(ConeCollisionShape);

  • code/branches/core6/src/modules/objects/collisionshapes/ConeCollisionShape.h

    r8706 r9629  
    5555    {
    5656        public:
    57             ConeCollisionShape(BaseObject* creator);
     57            ConeCollisionShape(Context* context);
    5858            virtual ~ConeCollisionShape();
    5959

  • code/branches/core6/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

    r8858 r9629  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     PlaneCollisionShape::PlaneCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    PlaneCollisionShape::PlaneCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(PlaneCollisionShape);

  • code/branches/core6/src/modules/objects/collisionshapes/PlaneCollisionShape.h

    r8706 r9629  
    5757    {
    5858        public:
    59             PlaneCollisionShape(BaseObject* creator);
     59            PlaneCollisionShape(Context* context);
    6060            virtual ~PlaneCollisionShape();
    6161

  • code/branches/core6/src/modules/objects/collisionshapes/SphereCollisionShape.cc

    r8858 r9629  
    4848        Constructor. registers and initializes the object.
    4949    */
    50     SphereCollisionShape::SphereCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    SphereCollisionShape::SphereCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(SphereCollisionShape);

  • code/branches/core6/src/modules/objects/collisionshapes/SphereCollisionShape.h

    r8706 r9629  
    5555    {
    5656        public:
    57             SphereCollisionShape(BaseObject* creator);
     57            SphereCollisionShape(Context* context);
    5858            virtual ~SphereCollisionShape();
    5959

  • code/branches/core6/src/modules/objects/eventsystem/EventDispatcher.cc

    r5929 r9629  
    3737    CreateFactory(EventDispatcher);
    3838
    39     EventDispatcher::EventDispatcher(BaseObject* creator) : BaseObject(creator)
     39    EventDispatcher::EventDispatcher(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(EventDispatcher);

  • code/branches/core6/src/modules/objects/eventsystem/EventDispatcher.h

    r7601 r9629  
    4646    {
    4747        public:
    48             EventDispatcher(BaseObject* creator);
     48            EventDispatcher(Context* context);
    4949            virtual ~EventDispatcher();
    5050

  • code/branches/core6/src/modules/objects/eventsystem/EventFilter.cc

    r8858 r9629  
    3838    CreateFactory(EventFilter);
    3939
    40     EventFilter::EventFilter(BaseObject* creator) : BaseObject(creator)
     40    EventFilter::EventFilter(Context* context) : BaseObject(context)
    4141    {
    4242        RegisterObject(EventFilter);

  • code/branches/core6/src/modules/objects/eventsystem/EventFilter.h

    r7601 r9629  
    4646    {
    4747        public:
    48             EventFilter(BaseObject* creator);
     48            EventFilter(Context* context);
    4949            virtual ~EventFilter();
    5050

  • code/branches/core6/src/modules/objects/eventsystem/EventListener.cc

    r8858 r9629  
    3737    CreateFactory(EventListener);
    3838
    39     EventListener::EventListener(BaseObject* creator) : BaseObject(creator)
     39    EventListener::EventListener(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(EventListener);

  • code/branches/core6/src/modules/objects/eventsystem/EventListener.h

    r7601 r9629  
    4747    {
    4848        public:
    49             EventListener(BaseObject* creator);
     49            EventListener(Context* context);
    5050            virtual ~EventListener();
    5151

  • code/branches/core6/src/modules/objects/eventsystem/EventName.cc

    r5929 r9629  
    3434    CreateFactory(EventName);
    3535
    36     EventName::EventName(BaseObject* creator) : BaseObject(creator)
     36    EventName::EventName(Context* context) : BaseObject(context)
    3737    {
    3838        RegisterObject(EventName);

  • code/branches/core6/src/modules/objects/eventsystem/EventName.h

    r7601 r9629  
    4545    {
    4646        public:
    47             EventName(BaseObject* creator);
     47            EventName(Context* context);
    4848            virtual ~EventName() {}
    4949    };

  • code/branches/core6/src/modules/objects/eventsystem/EventTarget.cc

    r8858 r9629  
    3535    CreateFactory(EventTarget);
    3636
    37     EventTarget::EventTarget(BaseObject* creator) : BaseObject(creator)
     37    EventTarget::EventTarget(Context* context) : BaseObject(context)
    3838    {
    3939        RegisterObject(EventTarget);

  • code/branches/core6/src/modules/objects/eventsystem/EventTarget.h

    r7601 r9629  
    4646    {
    4747        public:
    48             EventTarget(BaseObject* creator);
     48            EventTarget(Context* context);
    4949            virtual ~EventTarget();
    5050

  • code/branches/core6/src/modules/objects/triggers/CheckPoint.cc

    r9348 r9629  
    4444    CreateFactory(CheckPoint);
    4545
    46     CheckPoint::CheckPoint(BaseObject* creator)
    47         : DistanceTrigger(creator)
    48         , RadarViewable(creator, static_cast<WorldEntity*>(this))
     46    CheckPoint::CheckPoint(Context* context)
     47        : DistanceTrigger(context)
     48        , RadarViewable(this, static_cast<WorldEntity*>(this))
    4949    {
    5050        RegisterObject(CheckPoint);

  • code/branches/core6/src/modules/objects/triggers/CheckPoint.h

    r7601 r9629  
    5555    {
    5656    public:
    57         CheckPoint(BaseObject* creator);
     57        CheckPoint(Context* context);
    5858        virtual ~CheckPoint();
    5959

  • code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.cc

    r8858 r9629  
    5353        Default Constructor. Registers the object and initializes default values.
    5454    */
    55     DistanceMultiTrigger::DistanceMultiTrigger(BaseObject* creator) : MultiTrigger(creator)
     55    DistanceMultiTrigger::DistanceMultiTrigger(Context* context) : MultiTrigger(context)
    5656    {
    5757        RegisterObject(DistanceMultiTrigger);

  • code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.h

    r9557 r9629  
    9595
    9696        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.
    9898            virtual ~DistanceMultiTrigger(); // Destructor.
    9999

  • code/branches/core6/src/modules/objects/triggers/DistanceTrigger.cc

    r8858 r9629  
    5757        The creator of this trigger.
    5858    */
    59     DistanceTrigger::DistanceTrigger(BaseObject* creator) : Trigger(creator)
     59    DistanceTrigger::DistanceTrigger(Context* context) : Trigger(context)
    6060    {
    6161        RegisterObject(DistanceTrigger);

  • code/branches/core6/src/modules/objects/triggers/DistanceTrigger.h

    r8706 r9629  
    9797    {
    9898        public:
    99             DistanceTrigger(BaseObject* creator); // Constructor. Registers and initializes the object.
     99            DistanceTrigger(Context* context); // Constructor. Registers and initializes the object.
    100100            virtual ~DistanceTrigger();
    101101

  • code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.cc

    r7601 r9629  
    4848        The creator of this object.
    4949    */
    50     DistanceTriggerBeacon::DistanceTriggerBeacon(BaseObject* creator) : StaticEntity(creator)
     50    DistanceTriggerBeacon::DistanceTriggerBeacon(Context* context) : StaticEntity(context)
    5151    {
    5252        RegisterObject(DistanceTriggerBeacon);

  • code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.h

    r7601 r9629  
    5757
    5858        public:
    59             DistanceTriggerBeacon(BaseObject* creator); //!< Constructor.
     59            DistanceTriggerBeacon(Context* context); //!< Constructor.
    6060            virtual ~DistanceTriggerBeacon() {} //!< Destructor.
    6161

  • code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.cc

    r7601 r9629  
    4949        Constructor. Registers the object.
    5050    */
    51     EventMultiTrigger::EventMultiTrigger(BaseObject* creator) : MultiTrigger(creator)
     51    EventMultiTrigger::EventMultiTrigger(Context* context) : MultiTrigger(context)
    5252    {
    5353        RegisterObject(EventMultiTrigger);

  • code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.h

    r8213 r9629  
    7373
    7474        public:
    75             EventMultiTrigger(BaseObject* creator); //!< Constructor. Registers the object.
     75            EventMultiTrigger(Context* context); //!< Constructor. Registers the object.
    7676            virtual ~EventMultiTrigger(); //!< Destructor.
    7777

  • code/branches/core6/src/modules/objects/triggers/EventTrigger.cc

    r8213 r9629  
    4848        The creator of the EventTrigger.
    4949    */
    50     EventTrigger::EventTrigger(BaseObject* creator) : Trigger(creator)
     50    EventTrigger::EventTrigger(Context* context) : Trigger(context)
    5151    {
    5252        RegisterObject(EventTrigger);

  • code/branches/core6/src/modules/objects/triggers/EventTrigger.h

    r8706 r9629  
    7070    {
    7171        public:
    72             EventTrigger(BaseObject* creator); // Constructor. Registers and initializes the object.
     72            EventTrigger(Context* context); // Constructor. Registers and initializes the object.
    7373            virtual ~EventTrigger();
    7474

  • code/branches/core6/src/modules/objects/triggers/MultiTrigger.cc

    r8858 r9629  
    5151        The creator.
    5252    */
    53     MultiTrigger::MultiTrigger(BaseObject* creator) : TriggerBase(creator)
     53    MultiTrigger::MultiTrigger(Context* context) : TriggerBase(context)
    5454    {
    5555        RegisterObject(MultiTrigger);
    … …  
    451451        }
    452452
    453         MultiTriggerContainer* container = new MultiTriggerContainer(this, this, originator);
     453        MultiTriggerContainer* container = new MultiTriggerContainer(this->getContext(), this, originator);
    454454        this->fireEvent(status, container);
    455455        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  
    9999    {
    100100        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.
    102102            virtual ~MultiTrigger(); //!< Destructor.
    103103

  • code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.cc

    r8706 r9629  
    5050        The creator.
    5151    */
    52     MultiTriggerContainer::MultiTriggerContainer(BaseObject* creator) : BaseObject(creator), originator_(NULL), data_(NULL)
     52    MultiTriggerContainer::MultiTriggerContainer(Context* context) : BaseObject(context), originator_(NULL), data_(NULL)
    5353    {
    5454        RegisterObject(MultiTriggerContainer);
    … …  
    6565        A pointer to the data that should be sent with the container.
    6666    */
    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)
    6868    {
    6969        RegisterObject(MultiTriggerContainer);

  • code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.h

    r7601 r9629  
    5858
    5959        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.
    6262            virtual ~MultiTriggerContainer(); //!< Destructor.
    6363

  • code/branches/core6/src/modules/objects/triggers/Trigger.cc

    r8706 r9629  
    5555        The creator of the Trigger.
    5656    */
    57     Trigger::Trigger(BaseObject* creator) : TriggerBase(creator)
     57    Trigger::Trigger(Context* context) : TriggerBase(context)
    5858    {
    5959        RegisterObject(Trigger);

  • code/branches/core6/src/modules/objects/triggers/Trigger.h

    r8213 r9629  
    8080    {
    8181        public:
    82             Trigger(BaseObject* creator); // Constructor. Registers and initializes the object.
     82            Trigger(Context* context); // Constructor. Registers and initializes the object.
    8383            virtual ~Trigger();
    8484

  • code/branches/core6/src/modules/objects/triggers/TriggerBase.cc

    r8858 r9629  
    5252        Constructor. Registers the object and initializes some values.
    5353    */
    54     TriggerBase::TriggerBase(BaseObject* creator) : StaticEntity(creator)
     54    TriggerBase::TriggerBase(Context* context) : StaticEntity(context)
    5555    {
    5656        RegisterObject(TriggerBase);

  • code/branches/core6/src/modules/objects/triggers/TriggerBase.h

    r8706 r9629  
    7474    {
    7575        public:
    76             TriggerBase(BaseObject* creator);
     76            TriggerBase(Context* context);
    7777            virtual ~TriggerBase();
    7878

  • code/branches/core6/src/modules/overlays/FadeoutText.cc

    r5929 r9629  
    3838    CreateFactory(FadeoutText);
    3939
    40     FadeoutText::FadeoutText(BaseObject* creator) : OverlayText(creator)
     40    FadeoutText::FadeoutText(Context* context) : OverlayText(context)
    4141    {
    4242        RegisterObject(FadeoutText);

  • code/branches/core6/src/modules/overlays/FadeoutText.h

    r7401 r9629  
    4141    {
    4242        public:
    43             FadeoutText(BaseObject* creator);
     43            FadeoutText(Context* context);
    4444            virtual ~FadeoutText() {}
    4545

  • code/branches/core6/src/modules/overlays/GUIOverlay.cc

    r8858 r9629  
    4343    CreateFactory(GUIOverlay);
    4444
    45     GUIOverlay::GUIOverlay(BaseObject* creator) : OrxonoxOverlay(creator)
     45    GUIOverlay::GUIOverlay(Context* context) : OrxonoxOverlay(context)
    4646    {
    4747        RegisterObject(GUIOverlay);

  • code/branches/core6/src/modules/overlays/GUIOverlay.h

    r7401 r9629  
    4141        public:
    4242
    43             GUIOverlay(BaseObject* creator);
     43            GUIOverlay(Context* context);
    4444            virtual ~GUIOverlay();
    4545

  • code/branches/core6/src/modules/overlays/OverlayText.cc

    r7401 r9629  
    4747    BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Right  == (int)OverlayText::Right);
    4848
    49     OverlayText::OverlayText(BaseObject* creator)
    50         : OrxonoxOverlay(creator)
     49    OverlayText::OverlayText(Context* context)
     50        : OrxonoxOverlay(context)
    5151    {
    5252        RegisterObject(OverlayText);

  • code/branches/core6/src/modules/overlays/OverlayText.h

    r7401 r9629  
    4949        };
    5050
    51         OverlayText(BaseObject* creator);
     51        OverlayText(Context* context);
    5252        virtual ~OverlayText();
    5353

  • code/branches/core6/src/modules/overlays/debugging/DebugFPSText.cc

    r5781 r9629  
    3737    CreateFactory(DebugFPSText);
    3838
    39     DebugFPSText::DebugFPSText(BaseObject* creator) : OverlayText(creator)
     39    DebugFPSText::DebugFPSText(Context* context) : OverlayText(context)
    4040    {
    4141        RegisterObject(DebugFPSText);

  • code/branches/core6/src/modules/overlays/debugging/DebugFPSText.h

    r5781 r9629  
    4040    {
    4141    public:
    42         DebugFPSText(BaseObject* creator);
     42        DebugFPSText(Context* context);
    4343        virtual ~DebugFPSText();
    4444

  • code/branches/core6/src/modules/overlays/debugging/DebugRTRText.cc

    r5781 r9629  
    3737    CreateFactory(DebugRTRText);
    3838
    39     DebugRTRText::DebugRTRText(BaseObject* creator) : OverlayText(creator)
     39    DebugRTRText::DebugRTRText(Context* context) : OverlayText(context)
    4040    {
    4141        RegisterObject(DebugRTRText);

  • code/branches/core6/src/modules/overlays/debugging/DebugRTRText.h

    r5781 r9629  
    4040    {
    4141    public:
    42         DebugRTRText(BaseObject* creator);
     42        DebugRTRText(Context* context);
    4343        virtual ~DebugRTRText();
    4444

  • code/branches/core6/src/modules/overlays/hud/AnnounceMessage.cc

    r5781 r9629  
    3636    CreateFactory(AnnounceMessage);
    3737
    38     AnnounceMessage::AnnounceMessage(BaseObject* creator) : FadeoutText(creator)
     38    AnnounceMessage::AnnounceMessage(Context* context) : FadeoutText(context)
    3939    {
    4040        RegisterObject(AnnounceMessage);

  • code/branches/core6/src/modules/overlays/hud/AnnounceMessage.h

    r5781 r9629  
    4040    {
    4141        public:
    42             AnnounceMessage(BaseObject* creator);
     42            AnnounceMessage(Context* context);
    4343            virtual ~AnnounceMessage() {}
    4444

  • code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc

    r9558 r9629  
    4646    CreateFactory(ChatOverlay);
    4747
    48     ChatOverlay::ChatOverlay(BaseObject* creator)
    49         : OverlayText(creator)
     48    ChatOverlay::ChatOverlay(Context* context)
     49        : OverlayText(context)
    5050    {
    5151        RegisterObject(ChatOverlay);

  • code/branches/core6/src/modules/overlays/hud/ChatOverlay.h

    r8858 r9629  
    4343    {
    4444        public:
    45             ChatOverlay(BaseObject* creator);
     45            ChatOverlay(Context* context);
    4646            virtual ~ChatOverlay();
    4747

  • code/branches/core6/src/modules/overlays/hud/DeathMessage.cc

    r5781 r9629  
    3636    CreateFactory(DeathMessage);
    3737
    38     DeathMessage::DeathMessage(BaseObject* creator) : FadeoutText(creator)
     38    DeathMessage::DeathMessage(Context* context) : FadeoutText(context)
    3939    {
    4040        RegisterObject(DeathMessage);

  • code/branches/core6/src/modules/overlays/hud/DeathMessage.h

    r5781 r9629  
    4040    {
    4141        public:
    42             DeathMessage(BaseObject* creator);
     42            DeathMessage(Context* context);
    4343            virtual ~DeathMessage() {}
    4444

  • code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.cc

    r7163 r9629  
    3636    CreateFactory(GametypeFadingMessage);
    3737
    38     GametypeFadingMessage::GametypeFadingMessage(BaseObject* creator) : FadeoutText(creator)
     38    GametypeFadingMessage::GametypeFadingMessage(Context* context) : FadeoutText(context)
    3939    {
    4040        RegisterObject(GametypeFadingMessage);

  • code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.h

    r8729 r9629  
    4040    {
    4141        public:
    42             GametypeFadingMessage(BaseObject* creator);
     42            GametypeFadingMessage(Context* context);
    4343            virtual ~GametypeFadingMessage();
    4444

  • code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.cc

    r7163 r9629  
    3939
    4040
    41     GametypeStaticMessage::GametypeStaticMessage(BaseObject* creator) : OverlayText(creator)
     41    GametypeStaticMessage::GametypeStaticMessage(Context* context) : OverlayText(context)
    4242    {
    4343        RegisterObject(GametypeStaticMessage);

  • code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.h

    r7163 r9629  
    4343    {
    4444        public:
    45             GametypeStaticMessage(BaseObject* creator);
     45            GametypeStaticMessage(Context* context);
    4646            virtual ~GametypeStaticMessage();
    4747

  • code/branches/core6/src/modules/overlays/hud/HUDBar.cc

    r8706 r9629  
    4747    CreateFactory(BarColour);
    4848
    49     BarColour::BarColour(BaseObject* creator)
    50         : BaseObject(creator)
     49    BarColour::BarColour(Context* context)
     50        : BaseObject(context)
    5151    {
    5252        RegisterObject(BarColour);
    … …  
    6767    unsigned int HUDBar::materialcount_s = 0;
    6868
    69     HUDBar::HUDBar(BaseObject* creator)
    70         : OrxonoxOverlay(creator), right2Left_(false), autoColour_(false)
     69    HUDBar::HUDBar(Context* context)
     70        : OrxonoxOverlay(context), right2Left_(false), autoColour_(false)
    7171    {
    7272        RegisterObject(HUDBar);

  • code/branches/core6/src/modules/overlays/hud/HUDBar.h

    r8706 r9629  
    4848    {
    4949    public:
    50         BarColour(BaseObject* creator);
     50        BarColour(Context* context);
    5151        virtual ~BarColour() { }
    5252
    … …  
    6868    {
    6969    public:
    70         HUDBar(BaseObject* creator);
     70        HUDBar(Context* context);
    7171        virtual ~HUDBar();
    7272

  • code/branches/core6/src/modules/overlays/hud/HUDBoostBar.cc

    r9348 r9629  
    3737    CreateFactory(HUDBoostBar);
    3838
    39     HUDBoostBar::HUDBoostBar(BaseObject* creator)
    40         : HUDBar(creator)
     39    HUDBoostBar::HUDBoostBar(Context* context)
     40        : HUDBar(context)
    4141    {
    4242        RegisterObject(HUDBoostBar);

  • code/branches/core6/src/modules/overlays/hud/HUDBoostBar.h

    r9348 r9629  
    4040    {
    4141    public:
    42         HUDBoostBar(BaseObject* creator);
     42        HUDBoostBar(Context* context);
    4343        virtual ~HUDBoostBar();
    4444

  • code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc

    r9558 r9629  
    3636    CreateFactory(HUDEnemyHealthBar);
    3737
    38     HUDEnemyHealthBar::HUDEnemyHealthBar(BaseObject* creator) : HUDHealthBar(creator)
     38    HUDEnemyHealthBar::HUDEnemyHealthBar(Context* context) : HUDHealthBar(context)
    3939    {
    4040        RegisterObject(HUDEnemyHealthBar);

  • code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.h

    r9348 r9629  
    3737    {
    3838        public:
    39             HUDEnemyHealthBar(BaseObject* creator);
     39            HUDEnemyHealthBar(Context* context);
    4040            virtual ~HUDEnemyHealthBar();
    4141

  • code/branches/core6/src/modules/overlays/hud/HUDHealthBar.cc

    r6054 r9629  
    3939    CreateFactory(HUDHealthBar);
    4040
    41     HUDHealthBar::HUDHealthBar(BaseObject* creator) : HUDBar(creator)
     41    HUDHealthBar::HUDHealthBar(Context* context) : HUDBar(context)
    4242    {
    4343        RegisterObject(HUDHealthBar);
    … …  
    4646        this->bUseBarColour_ = false;
    4747
    48         this->textoverlay_ = new OverlayText(this);
     48        this->textoverlay_ = new OverlayText(this->getContext());
    4949
    5050        assert(this->textoverlay_.get());

  • code/branches/core6/src/modules/overlays/hud/HUDHealthBar.h

    r9259 r9629  
    4242    {
    4343        public:
    44             HUDHealthBar(BaseObject* creator);
     44            HUDHealthBar(Context* context);
    4545            virtual ~HUDHealthBar();
    4646

  • code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc

    r9558 r9629  
    7171    HUDNavigation* HUDNavigation::localHUD_s = 0;
    7272
    73     HUDNavigation::HUDNavigation(BaseObject* creator) :
    74         OrxonoxOverlay(creator)
     73    HUDNavigation::HUDNavigation(Context* context) :
     74        OrxonoxOverlay(context)
    7575    {
    7676        RegisterObject(HUDNavigation)

  • code/branches/core6/src/modules/overlays/hud/HUDNavigation.h

    r9526 r9629  
    4646    {
    4747        public:
    48             HUDNavigation(BaseObject* creator);
     48            HUDNavigation(Context* context);
    4949            virtual ~HUDNavigation();
    5050

  • code/branches/core6/src/modules/overlays/hud/HUDRadar.cc

    r9348 r9629  
    4646    CreateFactory(HUDRadar);
    4747
    48     HUDRadar::HUDRadar(BaseObject* creator)
    49         : OrxonoxOverlay(creator)
     48    HUDRadar::HUDRadar(Context* context)
     49        : OrxonoxOverlay(context)
    5050    {
    5151        RegisterObject(HUDRadar);

  • code/branches/core6/src/modules/overlays/hud/HUDRadar.h

    r8891 r9629  
    4646    {
    4747    public:
    48         HUDRadar(BaseObject* creator);
     48        HUDRadar(Context* context);
    4949        virtual ~HUDRadar();
    5050

  • code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.cc

    r8706 r9629  
    3838    CreateFactory(HUDSpeedBar);
    3939
    40     HUDSpeedBar::HUDSpeedBar(BaseObject* creator)
    41         : HUDBar(creator)
     40    HUDSpeedBar::HUDSpeedBar(Context* context)
     41        : HUDBar(context)
    4242    {
    4343        RegisterObject(HUDSpeedBar);

  • code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.h

    r5781 r9629  
    4141    {
    4242    public:
    43         HUDSpeedBar(BaseObject* creator);
     43        HUDSpeedBar(Context* context);
    4444        virtual ~HUDSpeedBar();
    4545

  • code/branches/core6/src/modules/overlays/hud/HUDTimer.cc

    r5781 r9629  
    3838    CreateFactory(HUDTimer);
    3939
    40     HUDTimer::HUDTimer(BaseObject* creator) : OverlayText(creator)
     40    HUDTimer::HUDTimer(Context* context) : OverlayText(context)
    4141    {
    4242        RegisterObject(HUDTimer);

  • code/branches/core6/src/modules/overlays/hud/HUDTimer.h

    r5781 r9629  
    4040    {
    4141    public:
    42         HUDTimer(BaseObject* creator);
     42        HUDTimer(Context* context);
    4343        virtual ~HUDTimer();
    4444

  • code/branches/core6/src/modules/overlays/hud/KillMessage.cc

    r5781 r9629  
    3636    CreateFactory(KillMessage);
    3737
    38     KillMessage::KillMessage(BaseObject* creator) : FadeoutText(creator)
     38    KillMessage::KillMessage(Context* context) : FadeoutText(context)
    3939    {
    4040        RegisterObject(KillMessage);

  • code/branches/core6/src/modules/overlays/hud/KillMessage.h

    r5781 r9629  
    4040    {
    4141        public:
    42             KillMessage(BaseObject* creator);
     42            KillMessage(Context* context);
    4343            virtual ~KillMessage() {}
    4444

  • code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.cc

    r7655 r9629  
    3939    CreateFactory(LastManStandingInfos);
    4040
    41     LastManStandingInfos::LastManStandingInfos(BaseObject* creator) : OverlayText(creator)
     41    LastManStandingInfos::LastManStandingInfos(Context* context) : OverlayText(context)
    4242    {
    4343        RegisterObject(LastManStandingInfos);

  • code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.h

    r7655 r9629  
    4040    {
    4141        public:
    42             LastManStandingInfos(BaseObject* creator);
     42            LastManStandingInfos(Context* context);
    4343            virtual ~LastManStandingInfos();
    4444

  • code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.cc

    r8351 r9629  
    3939    CreateFactory(LastTeamStandingInfos);
    4040
    41     LastTeamStandingInfos::LastTeamStandingInfos(BaseObject* creator) : OverlayText(creator)
     41    LastTeamStandingInfos::LastTeamStandingInfos(Context* context) : OverlayText(context)
    4242    {
    4343        RegisterObject(LastTeamStandingInfos);

  • code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.h

    r8178 r9629  
    4040    {
    4141        public:
    42             LastTeamStandingInfos(BaseObject* creator);
     42            LastTeamStandingInfos(Context* context);
    4343            virtual ~LastTeamStandingInfos();
    4444

  • code/branches/core6/src/modules/overlays/hud/PauseNotice.cc

    r8079 r9629  
    3636    CreateFactory(PauseNotice);
    3737
    38     PauseNotice::PauseNotice(BaseObject* creator) : OverlayText(creator)
     38    PauseNotice::PauseNotice(Context* context) : OverlayText(context)
    3939    {
    4040        RegisterObject(PauseNotice);

  • code/branches/core6/src/modules/overlays/hud/PauseNotice.h

    r8079 r9629  
    4040    {
    4141        public:
    42             PauseNotice(BaseObject* creator);
     42            PauseNotice(Context* context);
    4343
    4444            virtual void changedOwner();

  • code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.cc

    r6417 r9629  
    3939    CreateFactory(TeamBaseMatchScore);
    4040
    41     TeamBaseMatchScore::TeamBaseMatchScore(BaseObject* creator) : OverlayText(creator)
     41    TeamBaseMatchScore::TeamBaseMatchScore(Context* context) : OverlayText(context)
    4242    {
    4343        RegisterObject(TeamBaseMatchScore);

  • code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.h

    r5781 r9629  
    4040    {
    4141        public:
    42             TeamBaseMatchScore(BaseObject* creator);
     42            TeamBaseMatchScore(Context* context);
    4343            virtual ~TeamBaseMatchScore();
    4444

  • code/branches/core6/src/modules/overlays/stats/Scoreboard.cc

    r7401 r9629  
    4040        @brief Constructor: Creates the scoreboard.
    4141    */
    42     Scoreboard::Scoreboard(BaseObject* creator)
    43         : OrxonoxOverlay(creator)
     42    Scoreboard::Scoreboard(Context* context)
     43        : OrxonoxOverlay(context)
    4444    {
    4545        RegisterObject(Scoreboard);

  • code/branches/core6/src/modules/overlays/stats/Scoreboard.h

    r7401 r9629  
    4141    {
    4242    public: // functions
    43         Scoreboard(BaseObject* creator);
     43        Scoreboard(Context* context);
    4444        virtual ~Scoreboard();
    4545

  • code/branches/core6/src/modules/overlays/stats/Stats.cc

    r9558 r9629  
    4444        @brief Constructor: Creates and initializes the Stats panel.
    4545    */
    46     Stats::Stats(BaseObject* creator)
    47         : OrxonoxOverlay(creator)
     46    Stats::Stats(Context* context)
     47        : OrxonoxOverlay(context)
    4848        , statsOverlayNoise_(0)
    4949        , statsOverlayBorder_(0)

  • code/branches/core6/src/modules/overlays/stats/Stats.h

    r7401 r9629  
    4141    {
    4242    public: // functions
    43         Stats(BaseObject* creator);
     43        Stats(Context* context);
    4444        virtual ~Stats();
    4545

  • code/branches/core6/src/modules/pickup/Pickup.cc

    r9348 r9629  
    5656        The objects creator.
    5757    */
    58     Pickup::Pickup(BaseObject* creator) : BaseObject(creator)
     58    Pickup::Pickup(Context* context) : BaseObject(context)
    5959    {
    6060        RegisterObject(Pickup);
    … …  
    187187    bool Pickup::createSpawner(void)
    188188    {
    189         PickupSpawner::createDroppedPickup(this, this, this->getCarrier());
     189        PickupSpawner::createDroppedPickup(this->getContext(), this, this->getCarrier());
    190190        return true;
    191191    }

  • code/branches/core6/src/modules/pickup/Pickup.h

    r9348 r9629  
    100100
    101101        public:
    102             Pickup(BaseObject* creator); //!< Constructor.
     102            Pickup(Context* context); //!< Constructor.
    103103            virtual ~Pickup(); //!< Destructor.
    104104

  • code/branches/core6/src/modules/pickup/PickupCollection.cc

    r9348 r9629  
    5353        The creator of the object.
    5454    */
    55     PickupCollection::PickupCollection(BaseObject* creator) : BaseObject(creator)
     55    PickupCollection::PickupCollection(Context* context) : BaseObject(context)
    5656    {
    5757        RegisterObject(PickupCollection);
    … …  
    328328    bool PickupCollection::createSpawner(void)
    329329    {
    330         PickupSpawner::createDroppedPickup(this, this, this->getCarrier());
     330        PickupSpawner::createDroppedPickup(this->getContext(), this, this->getCarrier());
    331331        return true;
    332332    }

  • code/branches/core6/src/modules/pickup/PickupCollection.h

    r9348 r9629  
    7070
    7171        public:
    72             PickupCollection(BaseObject* creator); //!< Default Constructor.
     72            PickupCollection(Context* context); //!< Default Constructor.
    7373            virtual ~PickupCollection(); //!< Destructor.
    7474

  • code/branches/core6/src/modules/pickup/PickupRepresentation.cc

    r9348 r9629  
    6464        Default Constructor. Registers the object and initializes its member variables.
    6565    */
    66     PickupRepresentation::PickupRepresentation(BaseObject* creator) : BaseObject(creator), Synchronisable(creator), spawnerRepresentation_(NULL)
     66    PickupRepresentation::PickupRepresentation(Context* context) : BaseObject(context), Synchronisable(context), spawnerRepresentation_(NULL)
    6767    {
    6868        RegisterObject(PickupRepresentation);
    … …  
    180180    StaticEntity* PickupRepresentation::getDefaultSpawnerRepresentation(PickupSpawner* spawner)
    181181    {
    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());
    184184        sphere->setColour(ColourValue(0.95f, 0.85f, 0.27f));
    185185        sphere->setMaterial("Sphere2");
    186186        sphere->setScale(0.1f);
    187         Billboard* icon = new Billboard(spawner);
     187        Billboard* icon = new Billboard(spawner->getContext());
    188188        icon->setColour(ColourValue(0.89f, 0.79f, 0.08f));
    189189        icon->setMaterial("asterisk");

  • code/branches/core6/src/modules/pickup/PickupRepresentation.h

    r9348 r9629  
    9595        public:
    9696            PickupRepresentation(); //!< Constructor
    97             PickupRepresentation(BaseObject* creator); //!< Default constructor.
     97            PickupRepresentation(Context* context); //!< Default constructor.
    9898            virtual ~PickupRepresentation(); //!< Destructor.
    9999

  • code/branches/core6/src/modules/pickup/PickupSpawner.cc

    r9348 r9629  
    5555        Pointer to the object which created this item.
    5656    */
    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)
    5858    {
    5959        RegisterObject(PickupSpawner);
    … …  
    9999        The distance at which the PickupSpawner will trigger.
    100100    */
    101     /*static*/ PickupSpawner* PickupSpawner::createDroppedPickup(BaseObject* creator, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance)
    102     {
    103         PickupSpawner* spawner = new PickupSpawner(creator);
     101    /*static*/ PickupSpawner* PickupSpawner::createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance)
     102    {
     103        PickupSpawner* spawner = new PickupSpawner(context);
    104104
    105105        spawner->setPickupable(pickup);
    … …  
    289289            if (identifier != NULL)
    290290            {
    291                 Pickupable* pickup = orxonox_cast<Pickupable*>(identifier->fabricate(this));
     291                Pickupable* pickup = orxonox_cast<Pickupable*>(identifier->fabricate(this->getContext()));
    292292                orxonox_cast<BaseObject*>(pickup)->addTemplate(this->pickupTemplate_);
    293293                return pickup;

  • code/branches/core6/src/modules/pickup/PickupSpawner.h

    r9348 r9629  
    7777    {
    7878        public:
    79             PickupSpawner(BaseObject* creator); //!< Default Constructor.
     79            PickupSpawner(Context* context); //!< Default Constructor.
    8080            virtual ~PickupSpawner(); //!< Destructor.
    8181
    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);
    8383
    8484            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  
    4848        Constructor. Registers the object and initializes the member variables.
    4949    */
    50     DamageBoostPickup::DamageBoostPickup(BaseObject* creator) : Pickup(creator)
     50    DamageBoostPickup::DamageBoostPickup(Context* context) : Pickup(context)
    5151    {
    5252        RegisterObject(DamageBoostPickup);

  • code/branches/core6/src/modules/pickup/items/DamageBoostPickup.h

    r9348 r9629  
    4949        public:
    5050
    51             DamageBoostPickup(BaseObject* creator); //!< Constructor.
     51            DamageBoostPickup(Context* context); //!< Constructor.
    5252            virtual ~DamageBoostPickup(); //!< Destructor.
    5353

  • code/branches/core6/src/modules/pickup/items/DronePickup.cc

    r9348 r9629  
    5151        Constructor. Registers the object and initializes the member variables.
    5252    */
    53     DronePickup::DronePickup(BaseObject* creator) : Pickup(creator)
     53    DronePickup::DronePickup(Context* context) : Pickup(context)
    5454    {
    5555        RegisterObject(DronePickup);
    … …  
    126126
    127127                //Attach to pawn
    128                 Drone* drone = new Drone(pawn->getCreator()); // 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)
    129129                drone->addTemplate(this->getDroneTemplate());
    130130

  • code/branches/core6/src/modules/pickup/items/DronePickup.h

    r9348 r9629  
    6464        public:
    6565
    66             DronePickup(BaseObject* creator); //!< Constructor.
     66            DronePickup(Context* context); //!< Constructor.
    6767            virtual ~DronePickup(); //!< Destructor.
    6868

  • code/branches/core6/src/modules/pickup/items/HealthPickup.cc

    r9348 r9629  
    5353        Constructor. Registers the object and initializes the member variables.
    5454    */
    55     HealthPickup::HealthPickup(BaseObject* creator) : Pickup(creator)
     55    HealthPickup::HealthPickup(Context* context) : Pickup(context)
    5656    {
    5757        RegisterObject(HealthPickup);

  • code/branches/core6/src/modules/pickup/items/HealthPickup.h

    r9348 r9629  
    9090        public:
    9191
    92             HealthPickup(BaseObject* creator); //!< Constructor.
     92            HealthPickup(Context* context); //!< Constructor.
    9393            virtual ~HealthPickup(); //!< Destructor.
    9494

  • code/branches/core6/src/modules/pickup/items/InvisiblePickup.cc

    r9348 r9629  
    5151        Constructor. Registers the object and initializes the member variables.
    5252    */
    53     InvisiblePickup::InvisiblePickup(BaseObject* creator) : Pickup(creator)
     53    InvisiblePickup::InvisiblePickup(Context* context) : Pickup(context)
    5454    {
    5555        RegisterObject(InvisiblePickup);

  • code/branches/core6/src/modules/pickup/items/InvisiblePickup.h

    r9348 r9629  
    7070        public:
    7171
    72             InvisiblePickup(BaseObject* creator); //!< Constructor.
     72            InvisiblePickup(Context* context); //!< Constructor.
    7373            virtual ~InvisiblePickup(); //!< Destructor.
    7474

  • code/branches/core6/src/modules/pickup/items/MetaPickup.cc

    r9348 r9629  
    5555        Constructor. Registers and initializes the object.
    5656    */
    57     MetaPickup::MetaPickup(BaseObject* creator) : Pickup(creator)
     57    MetaPickup::MetaPickup(Context* context) : Pickup(context)
    5858    {
    5959        RegisterObject(MetaPickup);

  • code/branches/core6/src/modules/pickup/items/MetaPickup.h

    r9348 r9629  
    8989
    9090        public:
    91             MetaPickup(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     91            MetaPickup(Context* context); //!< Constructor. Registers and initializes the object.
    9292            virtual ~MetaPickup(); //!< Destructor.
    9393

  • code/branches/core6/src/modules/pickup/items/ShieldPickup.cc

    r9348 r9629  
    4848        Constructor. Registers the object and initializes the member variables.
    4949    */
    50     ShieldPickup::ShieldPickup(BaseObject* creator) : Pickup(creator)
     50    ShieldPickup::ShieldPickup(Context* context) : Pickup(context)
    5151    {
    5252        RegisterObject(ShieldPickup);

  • code/branches/core6/src/modules/pickup/items/ShieldPickup.h

    r9348 r9629  
    7676        public:
    7777
    78             ShieldPickup(BaseObject* creator); //!< Constructor.
     78            ShieldPickup(Context* context); //!< Constructor.
    7979            virtual ~ShieldPickup(); //!< Destructor.
    8080

  • code/branches/core6/src/modules/pickup/items/ShrinkPickup.cc

    r9348 r9629  
    5252        Constructor: Initializes the Pickup.
    5353    */
    54     ShrinkPickup::ShrinkPickup(BaseObject* creator) : Pickup(creator)
     54    ShrinkPickup::ShrinkPickup(Context* context) : Pickup(context)
    5555    {
    5656        RegisterObject(ShrinkPickup);

  • code/branches/core6/src/modules/pickup/items/ShrinkPickup.h

    r9348 r9629  
    7272    {
    7373        public:
    74             ShrinkPickup(BaseObject* creator); // Constructor.
     74            ShrinkPickup(Context* context); // Constructor.
    7575            virtual ~ShrinkPickup(); // Destructor.
    7676

  • code/branches/core6/src/modules/pickup/items/SpeedPickup.cc

    r9348 r9629  
    4848        Constructor. Registers the object and initializes the member variables.
    4949    */
    50     SpeedPickup::SpeedPickup(BaseObject* creator) : Pickup(creator)
     50    SpeedPickup::SpeedPickup(Context* context) : Pickup(context)
    5151    {
    5252        RegisterObject(SpeedPickup);

  • code/branches/core6/src/modules/pickup/items/SpeedPickup.h

    r9348 r9629  
    7575        public:
    7676
    77             SpeedPickup(BaseObject* creator); //!< Constructor.
     77            SpeedPickup(Context* context); //!< Constructor.
    7878            virtual ~SpeedPickup(); //!< Destructor.
    7979

  • code/branches/core6/src/modules/pong/Pong.cc

    r9558 r9629  
    5959        Constructor. Registers and initializes the object.
    6060    */
    61     Pong::Pong(BaseObject* creator) : Deathmatch(creator)
     61    Pong::Pong(Context* context) : Deathmatch(context)
    6262    {
    6363        RegisterObject(Pong);
    … …  
    129129            if (this->ball_ == NULL) // If there is no ball, create a new ball.
    130130            {
    131                 this->ball_ = new PongBall(this->center_);
     131                this->ball_ = new PongBall(this->center_->getContext());
    132132                // Apply the template for the ball specified by the centerpoint.
    133133                this->ball_->addTemplate(this->center_->getBalltemplate());
    … …  
    147147                if (this->bat_[i] == NULL)
    148148                {
    149                     this->bat_[i] = new PongBat(this->center_);
     149                    this->bat_[i] = new PongBat(this->center_->getContext());
    150150                    this->bat_[i]->addTemplate(this->center_->getBattemplate());
    151151                }

  • code/branches/core6/src/modules/pong/Pong.h

    r9348 r9629  
    6565    {
    6666        public:
    67             Pong(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     67            Pong(Context* context); //!< Constructor. Registers and initializes the object.
    6868            virtual ~Pong(); //!< Destructor. Cleans up, if initialized.
    6969

  • code/branches/core6/src/modules/pong/PongAI.cc

    r9558 r9629  
    5353        Constructor. Registers and initializes the object.
    5454    */
    55     PongAI::PongAI(BaseObject* creator) : Controller(creator)
     55    PongAI::PongAI(Context* context) : Controller(context)
    5656    {
    5757        RegisterObject(PongAI);

  • code/branches/core6/src/modules/pong/PongAI.h

    r9579 r9629  
    6161    {
    6262        public:
    63             PongAI(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     63            PongAI(Context* context); //!< Constructor. Registers and initializes the object.
    6464            virtual ~PongAI();
    6565

  • code/branches/core6/src/modules/pong/PongBall.cc

    r8108 r9629  
    5151        Constructor. Registers and initializes the object.
    5252    */
    53     PongBall::PongBall(BaseObject* creator)
    54         : MovableEntity(creator)
     53    PongBall::PongBall(Context* context)
     54        : MovableEntity(context)
    5555    {
    5656        RegisterObject(PongBall);

  • code/branches/core6/src/modules/pong/PongBall.h

    r8108 r9629  
    5959    {
    6060        public:
    61             PongBall(BaseObject* creator);
     61            PongBall(Context* context);
    6262            virtual ~PongBall();
    6363

  • code/branches/core6/src/modules/pong/PongBat.cc

    r8108 r9629  
    4545        Constructor. Registers and initializes the object.
    4646    */
    47     PongBat::PongBat(BaseObject* creator) : ControllableEntity(creator)
     47    PongBat::PongBat(Context* context) : ControllableEntity(context)
    4848    {
    4949        RegisterObject(PongBat);

  • code/branches/core6/src/modules/pong/PongBat.h

    r8706 r9629  
    5757    {
    5858        public:
    59             PongBat(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     59            PongBat(Context* context); //!< Constructor. Registers and initializes the object.
    6060            virtual ~PongBat() {}
    6161

  • code/branches/core6/src/modules/pong/PongBot.cc

    r8108 r9629  
    4545        Constructor. Registers the object and creates a PongAI controller.
    4646    */
    47     PongBot::PongBot(BaseObject* creator) : Bot(creator)
     47    PongBot::PongBot(Context* context) : Bot(context)
    4848    {
    4949        RegisterObject(PongBot);

  • code/branches/core6/src/modules/pong/PongBot.h

    r8108 r9629  
    5656    {
    5757        public:
    58             PongBot(BaseObject* creator);
     58            PongBot(Context* context);
    5959            virtual ~PongBot() {}
    6060    };

  • code/branches/core6/src/modules/pong/PongCenterpoint.cc

    r8108 r9629  
    4747        Constructor. Registers and initializes the object and checks whether the gametype is actually Pong.
    4848    */
    49     PongCenterpoint::PongCenterpoint(BaseObject* creator) : StaticEntity(creator)
     49    PongCenterpoint::PongCenterpoint(Context* context) : StaticEntity(context)
    5050    {
    5151        RegisterObject(PongCenterpoint);

  • code/branches/core6/src/modules/pong/PongCenterpoint.h

    r8108 r9629  
    121121    {
    122122        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.
    124124            virtual ~PongCenterpoint() {}
    125125

  • code/branches/core6/src/modules/pong/PongScore.cc

    r9264 r9629  
    5050        Constructor. Registers and initializes the object.
    5151    */
    52     PongScore::PongScore(BaseObject* creator) : OverlayText(creator)
     52    PongScore::PongScore(Context* context) : OverlayText(context)
    5353    {
    5454        RegisterObject(PongScore);

  • code/branches/core6/src/modules/pong/PongScore.h

    r9258 r9629  
    5757    {
    5858        public:
    59             PongScore(BaseObject* creator);
     59            PongScore(Context* context);
    6060            virtual ~PongScore();
    6161

  • code/branches/core6/src/modules/portals/PortalEndPoint.cc

    r9526 r9629  
    4848    std::map<unsigned int, PortalEndPoint *> PortalEndPoint::idMap_s;
    4949
    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)
    5151    {
    5252        RegisterObject(PortalEndPoint);
    5353
    54         this->trigger_ = new DistanceMultiTrigger(this);
     54        this->trigger_ = new DistanceMultiTrigger(this->getContext());
    5555        this->trigger_->setName("portal");
    5656        this->attach(this->trigger_);
    … …  
    6161        if( GameMode::isMaster() )
    6262        {
    63             this->portalSound_ = new WorldSound(this);
     63            this->portalSound_ = new WorldSound(this->getContext());
    6464            this->portalSound_->setLooping(false);
    6565            this->attach(this->portalSound_);

  • code/branches/core6/src/modules/portals/PortalEndPoint.h

    r9526 r9629  
    6060    {
    6161        public:
    62             PortalEndPoint(BaseObject* creator);
     62            PortalEndPoint(Context* context);
    6363            virtual ~PortalEndPoint();
    6464

  • code/branches/core6/src/modules/portals/PortalLink.cc

    r8767 r9629  
    4040    std::map<PortalEndPoint *, PortalEndPoint *> PortalLink::links_s;
    4141
    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)
    4343    {
    4444        RegisterObject(PortalLink);

  • code/branches/core6/src/modules/portals/PortalLink.h

    r8767 r9629  
    5454    {
    5555        public:
    56             PortalLink(BaseObject* creator);
     56            PortalLink(Context* context);
    5757            virtual ~PortalLink();
    5858            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

  • code/branches/core6/src/modules/questsystem/GlobalQuest.cc

    r8858 r9629  
    4747        Constructor. Registers the object.
    4848    */
    49     GlobalQuest::GlobalQuest(BaseObject* creator) : Quest(creator)
     49    GlobalQuest::GlobalQuest(Context* context) : Quest(context)
    5050    {
    5151        RegisterObject(GlobalQuest);

  • code/branches/core6/src/modules/questsystem/GlobalQuest.h

    r7552 r9629  
    9090    {
    9191        public:
    92             GlobalQuest(BaseObject* creator);
     92            GlobalQuest(Context* context);
    9393            virtual ~GlobalQuest();
    9494

  • code/branches/core6/src/modules/questsystem/LocalQuest.cc

    r8858 r9629  
    4747        Constructor. Registers and initializes the object.
    4848    */
    49     LocalQuest::LocalQuest(BaseObject* creator) : Quest(creator)
     49    LocalQuest::LocalQuest(Context* context) : Quest(context)
    5050    {
    5151        RegisterObject(LocalQuest);

  • code/branches/core6/src/modules/questsystem/LocalQuest.h

    r7552 r9629  
    8484    {
    8585        public:
    86             LocalQuest(BaseObject* creator);
     86            LocalQuest(Context* context);
    8787            virtual ~LocalQuest();
    8888

  • code/branches/core6/src/modules/questsystem/Quest.cc

    r8858 r9629  
    4949        Constructor. Registers and initializes object.
    5050    */
    51     Quest::Quest(BaseObject* creator) : QuestItem(creator)
     51    Quest::Quest(Context* context) : QuestItem(context)
    5252    {
    5353        RegisterObject(Quest);

  • code/branches/core6/src/modules/questsystem/Quest.h

    r7552 r9629  
    8282    { // tolua_export
    8383        public:
    84             Quest(BaseObject* creator);
     84            Quest(Context* context);
    8585            virtual ~Quest();
    8686

  • code/branches/core6/src/modules/questsystem/QuestDescription.cc

    r8858 r9629  
    5252        Constructor. Registers and initializes the object.
    5353    */
    54     QuestDescription::QuestDescription(BaseObject* creator) : BaseObject(creator)
     54    QuestDescription::QuestDescription(Context* context) : BaseObject(context)
    5555    {
    5656        RegisterObject(QuestDescription);

  • code/branches/core6/src/modules/questsystem/QuestDescription.h

    r7552 r9629  
    6464// tolua_end
    6565        public:
    66             QuestDescription(BaseObject* creator);
     66            QuestDescription(Context* context);
    6767            virtual ~QuestDescription();
    6868

  • code/branches/core6/src/modules/questsystem/QuestEffect.cc

    r8858 r9629  
    4242        Is not meant to be invoked directly, since this is only an interface.
    4343    */
    44     QuestEffect::QuestEffect(BaseObject* creator) : BaseObject(creator)
     44    QuestEffect::QuestEffect(Context* context) : BaseObject(context)
    4545    {
    4646        RegisterObject(QuestEffect);

  • code/branches/core6/src/modules/questsystem/QuestEffect.h

    r7552 r9629  
    5757    {
    5858        public:
    59             QuestEffect(BaseObject* creator);
     59            QuestEffect(Context* context);
    6060            virtual ~QuestEffect();
    6161

  • code/branches/core6/src/modules/questsystem/QuestEffectBeacon.cc

    r8858 r9629  
    5151        Constructor. Registers the object and initializes defaults.
    5252    */
    53     QuestEffectBeacon::QuestEffectBeacon(BaseObject* creator) : StaticEntity(creator)
     53    QuestEffectBeacon::QuestEffectBeacon(Context* context) : StaticEntity(context)
    5454    {
    5555        RegisterObject(QuestEffectBeacon);

  • code/branches/core6/src/modules/questsystem/QuestEffectBeacon.h

    r7552 r9629  
    9393    {
    9494        public:
    95             QuestEffectBeacon(BaseObject* creator);
     95            QuestEffectBeacon(Context* context);
    9696            virtual ~QuestEffectBeacon();
    9797

  • code/branches/core6/src/modules/questsystem/QuestHint.cc

    r8858 r9629  
    4949        Constructor. Registers the object.
    5050    */
    51     QuestHint::QuestHint(BaseObject* creator) : QuestItem(creator)
     51    QuestHint::QuestHint(Context* context) : QuestItem(context)
    5252    {
    5353        RegisterObject(QuestHint);

  • code/branches/core6/src/modules/questsystem/QuestHint.h

    r7552 r9629  
    8282
    8383        public:
    84             QuestHint(BaseObject* creator);
     84            QuestHint(Context* context);
    8585            virtual ~QuestHint();
    8686

  • code/branches/core6/src/modules/questsystem/QuestItem.cc

    r8858 r9629  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     QuestItem::QuestItem(BaseObject* creator) : BaseObject(creator)
     50    QuestItem::QuestItem(Context* context) : BaseObject(context)
    5151    {
    5252        this->registered_ = false;

  • code/branches/core6/src/modules/questsystem/QuestItem.h

    r8891 r9629  
    6060
    6161        public:
    62             QuestItem(BaseObject* creator);
     62            QuestItem(Context* context);
    6363            virtual ~QuestItem();
    6464

  • code/branches/core6/src/modules/questsystem/QuestListener.cc

    r8858 r9629  
    5454        Constructor. Registers the object and initializes variables.
    5555    */
    56     QuestListener::QuestListener(BaseObject* creator) : BaseObject(creator)
     56    QuestListener::QuestListener(Context* context) : BaseObject(context)
    5757    {
    5858        RegisterObject(QuestListener);

  • code/branches/core6/src/modules/questsystem/QuestListener.h

    r7552 r9629  
    8787
    8888        public:
    89             QuestListener(BaseObject* creator);
     89            QuestListener(Context* context);
    9090            virtual ~QuestListener();
    9191

  • code/branches/core6/src/modules/questsystem/effects/AddQuest.cc

    r8858 r9629  
    4949        Constructor. Registers the object.
    5050    */
    51     AddQuest::AddQuest(BaseObject* creator) : ChangeQuestStatus(creator)
     51    AddQuest::AddQuest(Context* context) : ChangeQuestStatus(context)
    5252    {
    5353        RegisterObject(AddQuest);

  • code/branches/core6/src/modules/questsystem/effects/AddQuest.h

    r7552 r9629  
    5959    {
    6060        public:
    61         AddQuest(BaseObject* creator);
     61        AddQuest(Context* context);
    6262        virtual ~AddQuest();
    6363

  • code/branches/core6/src/modules/questsystem/effects/AddQuestHint.cc

    r8858 r9629  
    5050        Constructor. Registers the object.
    5151    */
    52     AddQuestHint::AddQuestHint(BaseObject* creator) : QuestEffect(creator)
     52    AddQuestHint::AddQuestHint(Context* context) : QuestEffect(context)
    5353    {
    5454        RegisterObject(AddQuestHint);

  • code/branches/core6/src/modules/questsystem/effects/AddQuestHint.h

    r7552 r9629  
    6161    {
    6262        public:
    63             AddQuestHint(BaseObject* creator);
     63            AddQuestHint(Context* context);
    6464            virtual ~AddQuestHint();
    6565

  • code/branches/core6/src/modules/questsystem/effects/AddReward.cc

    r8858 r9629  
    4747        Constructor. Registers the object.
    4848    */
    49     AddReward::AddReward(BaseObject* creator) : QuestEffect(creator)
     49    AddReward::AddReward(Context* context) : QuestEffect(context)
    5050    {
    5151        RegisterObject(AddReward);

  • code/branches/core6/src/modules/questsystem/effects/AddReward.h

    r7552 r9629  
    6565    {
    6666        public:
    67             AddReward(BaseObject* creator);
     67            AddReward(Context* context);
    6868            virtual ~AddReward();
    6969

  • code/branches/core6/src/modules/questsystem/effects/ChangeQuestStatus.cc

    r8858 r9629  
    4646        Constructor. Registers the object.
    4747    */
    48     ChangeQuestStatus::ChangeQuestStatus(BaseObject* creator) : QuestEffect(creator)
     48    ChangeQuestStatus::ChangeQuestStatus(Context* context) : QuestEffect(context)
    4949    {
    5050        RegisterObject(ChangeQuestStatus);

  • code/branches/core6/src/modules/questsystem/effects/ChangeQuestStatus.h

    r7552 r9629  
    5656    {
    5757        public:
    58             ChangeQuestStatus(BaseObject* creator);
     58            ChangeQuestStatus(Context* context);
    5959            virtual ~ChangeQuestStatus();
    6060

  • code/branches/core6/src/modules/questsystem/effects/CompleteQuest.cc

    r8858 r9629  
    4848        Constructor. Registers the object.
    4949    */
    50     CompleteQuest::CompleteQuest(BaseObject* creator) : ChangeQuestStatus(creator)
     50    CompleteQuest::CompleteQuest(Context* context) : ChangeQuestStatus(context)
    5151    {
    5252        RegisterObject(CompleteQuest);

  • code/branches/core6/src/modules/questsystem/effects/CompleteQuest.h

    r7552 r9629  
    5959    {
    6060        public:
    61             CompleteQuest(BaseObject* creator);
     61            CompleteQuest(Context* context);
    6262            virtual ~CompleteQuest();
    6363

  • code/branches/core6/src/modules/questsystem/effects/FailQuest.cc

    r8858 r9629  
    4848        Constructor. Registers the object.
    4949    */
    50     FailQuest::FailQuest(BaseObject* creator) : ChangeQuestStatus(creator)
     50    FailQuest::FailQuest(Context* context) : ChangeQuestStatus(context)
    5151    {
    5252        RegisterObject(FailQuest);

  • code/branches/core6/src/modules/questsystem/effects/FailQuest.h

    r7552 r9629  
    5959    {
    6060        public:
    61             FailQuest(BaseObject* creator);
     61            FailQuest(Context* context);
    6262            virtual ~FailQuest();
    6363

  • code/branches/core6/src/modules/tetris/Tetris.cc

    r9348 r9629  
    6161    @ingroup Tetris
    6262    */
    63     Tetris::Tetris(BaseObject* creator) : Deathmatch(creator)
     63    Tetris::Tetris(Context* context) : Deathmatch(context)
    6464    {
    6565        RegisterObject(Tetris);
    … …  
    379379    {
    380380        // create new futureBrick_
    381         this->futureBrick_ = new TetrisBrick(this->center_);
     381        this->futureBrick_ = new TetrisBrick(this->center_->getContext());
    382382
    383383

  • code/branches/core6/src/modules/tetris/Tetris.h

    r9348 r9629  
    5555    {
    5656        public:
    57             Tetris(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     57            Tetris(Context* context); //!< Constructor. Registers and initializes the object.
    5858            virtual ~Tetris(); //!< Destructor. Cleans up, if initialized.
    5959

  • code/branches/core6/src/modules/tetris/TetrisBrick.cc

    r9348 r9629  
    5151    @ingroup Tetris
    5252    */
    53     TetrisBrick::TetrisBrick(BaseObject* creator): ControllableEntity(creator)
     53    TetrisBrick::TetrisBrick(Context* context): ControllableEntity(context)
    5454    {
    5555        RegisterObject(TetrisBrick);
    … …  
    7777        {
    7878            // Create a new stone and add it to the brick.
    79             TetrisStone* stone = new TetrisStone(this);
     79            TetrisStone* stone = new TetrisStone(this->getContext());
    8080            this->brickStones_.push_back(stone);
    8181            this->attach(stone);

  • code/branches/core6/src/modules/tetris/TetrisBrick.h

    r9348 r9629  
    5454    {
    5555        public:
    56             TetrisBrick(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     56            TetrisBrick(Context* context); //!< Constructor. Registers and initializes the object.
    5757            virtual ~TetrisBrick() {}
    5858

  • code/branches/core6/src/modules/tetris/TetrisCenterpoint.cc

    r9348 r9629  
    4848        Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.
    4949    */
    50     TetrisCenterpoint::TetrisCenterpoint(BaseObject* creator) : StaticEntity(creator)
     50    TetrisCenterpoint::TetrisCenterpoint(Context* context) : StaticEntity(context)
    5151    {
    5252        RegisterObject(TetrisCenterpoint);

  • code/branches/core6/src/modules/tetris/TetrisCenterpoint.h

    r9348 r9629  
    5959    {
    6060        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.
    6262            virtual ~TetrisCenterpoint() {}
    6363

  • code/branches/core6/src/modules/tetris/TetrisScore.cc

    r9348 r9629  
    5252    @ingroup Tetris
    5353    */
    54     TetrisScore::TetrisScore(BaseObject* creator) : OverlayText(creator)
     54    TetrisScore::TetrisScore(Context* context) : OverlayText(context)
    5555    {
    5656        RegisterObject(TetrisScore);

  • code/branches/core6/src/modules/tetris/TetrisScore.h

    r9348 r9629  
    5757    {
    5858        public:
    59             TetrisScore(BaseObject* creator);
     59            TetrisScore(Context* context);
    6060            virtual ~TetrisScore();
    6161

  • code/branches/core6/src/modules/tetris/TetrisStone.cc

    r9348 r9629  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     TetrisStone::TetrisStone(BaseObject* creator) : MovableEntity(creator)
     50    TetrisStone::TetrisStone(Context* context) : MovableEntity(context)
    5151    {
    5252        RegisterObject(TetrisStone);

  • code/branches/core6/src/modules/tetris/TetrisStone.h

    r9348 r9629  
    5454    {
    5555        public:
    56             TetrisStone(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     56            TetrisStone(Context* context); //!< Constructor. Registers and initializes the object.
    5757            virtual ~TetrisStone() {}
    5858

  • code/branches/core6/src/modules/towerdefense/Tower.cc

    r9272 r9629  
    2222        Constructor. Registers and initializes the object.
    2323    */
    24     Tower::Tower(BaseObject* creator) : Pawn(creator)
     24    Tower::Tower(Context* context) : Pawn(context)
    2525    {
    2626        RegisterObject(Tower);

  • code/branches/core6/src/modules/towerdefense/Tower.h

    r9272 r9629  
    2727    {
    2828    public:
    29         Tower(BaseObject* creator);
     29        Tower(Context* context);
    3030        virtual ~Tower() {};
    3131

  • code/branches/core6/src/modules/towerdefense/TowerDefense.cc

    r9579 r9629  
    9696    CreateUnloadableFactory(TowerDefense);
    9797
    98     TowerDefense::TowerDefense(BaseObject* creator) : Deathmatch(creator)
     98    TowerDefense::TowerDefense(Context* context) : Deathmatch(context)
    9999    {
    100100        RegisterObject(TowerDefense);
    … …  
    190190
    191191        // Create tower
    192         Tower* newTower = new Tower(this->center_);
     192        Tower* newTower = new Tower(this->center_->getContext());
    193193        newTower->addTemplate(this->center_->getTowerTemplate());
    194194

  • code/branches/core6/src/modules/towerdefense/TowerDefense.h

    r9347 r9629  
    4848    {
    4949    public:
    50         TowerDefense(BaseObject* creator);
     50        TowerDefense(Context* context);
    5151        virtual ~TowerDefense();
    5252

  • code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.cc

    r9272 r9629  
    4747        Constructor. Registers and initializes the object and checks whether the gametype is actually TowerDefense.
    4848    */
    49     TowerDefenseCenterpoint::TowerDefenseCenterpoint(BaseObject* creator) : MobileEntity(creator)
     49    TowerDefenseCenterpoint::TowerDefenseCenterpoint(Context* context) : MobileEntity(context)
    5050    {
    5151        RegisterObject(TowerDefenseCenterpoint);

  • code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.h

    r9272 r9629  
    4949    {
    5050        public:
    51             TowerDefenseCenterpoint(BaseObject* creator);
     51            TowerDefenseCenterpoint(Context* context);
    5252            virtual ~TowerDefenseCenterpoint() {}
    5353

  • code/branches/core6/src/modules/towerdefense/TowerDefenseController.cc

    r9271 r9629  
    3838    CreateFactory(TowerDefenseController);
    3939
    40     TowerDefenseController::TowerDefenseController(BaseObject* creator) : WaypointController(creator)
     40    TowerDefenseController::TowerDefenseController(Context* context) : WaypointController(context)
    4141    {
    4242        RegisterObject(TowerDefenseController);

  • code/branches/core6/src/modules/towerdefense/TowerDefenseController.h

    r9271 r9629  
    4040    {
    4141        public:
    42             TowerDefenseController(BaseObject* creator);
     42            TowerDefenseController(Context* context);
    4343            virtual ~TowerDefenseController() {}
    4444

  • code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.cc

    r9272 r9629  
    3737    CreateFactory(TowerDefenseHUDController);
    3838
    39     TowerDefenseHUDController::TowerDefenseHUDController(BaseObject* creator) : OverlayText(creator)
     39    TowerDefenseHUDController::TowerDefenseHUDController(Context* context) : OverlayText(context)
    4040    {
    4141        RegisterObject(TowerDefenseHUDController);

  • code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.h

    r9272 r9629  
    4949    {
    5050    public:
    51         TowerDefenseHUDController(BaseObject* creator);
     51        TowerDefenseHUDController(Context* context);
    5252        virtual ~TowerDefenseHUDController();
    5353

  • code/branches/core6/src/modules/weapons/MuzzleFlash.cc

    r8855 r9629  
    4141    CreateFactory(MuzzleFlash);
    4242
    43     MuzzleFlash::MuzzleFlash(BaseObject* creator) : Billboard(creator)
     43    MuzzleFlash::MuzzleFlash(Context* context) : Billboard(context)
    4444    {
    4545        RegisterObject(MuzzleFlash);

  • code/branches/core6/src/modules/weapons/MuzzleFlash.h

    r8855 r9629  
    5555    {
    5656        public:
    57             MuzzleFlash(BaseObject* creator);
     57            MuzzleFlash(Context* context);
    5858            virtual ~MuzzleFlash() {}
    5959

  • code/branches/core6/src/modules/weapons/RocketController.cc

    r9348 r9629  
    4545        Constructor.
    4646    */
    47     RocketController::RocketController(BaseObject* creator) : Controller(creator)
     47    RocketController::RocketController(Context* context) : Controller(context)
    4848    {
    4949        RegisterObject(RocketController);
    … …  
    5151
    5252        // Create a rocket for the controller.
    53         this->rocket_ = new SimpleRocket(this);
     53        this->rocket_ = new SimpleRocket(this->getContext());
    5454        this->rocket_->setController(this);
    5555        this->setControllableEntity(orxonox_cast<ControllableEntity*>(this->rocket_));

  • code/branches/core6/src/modules/weapons/RocketController.h

    r8855 r9629  
    5252    {
    5353        public:
    54             RocketController(BaseObject* creator);
     54            RocketController(Context* context);
    5555            virtual ~RocketController();
    5656

  • code/branches/core6/src/modules/weapons/munitions/FusionMunition.cc

    r8855 r9629  
    3939    CreateFactory(FusionMunition);
    4040
    41     FusionMunition::FusionMunition(BaseObject* creator) : Munition(creator)
     41    FusionMunition::FusionMunition(Context* context) : Munition(context)
    4242    {
    4343        RegisterObject(FusionMunition);

  • code/branches/core6/src/modules/weapons/munitions/FusionMunition.h

    r8855 r9629  
    5151    {
    5252        public:
    53             FusionMunition(BaseObject* creator);
     53            FusionMunition(Context* context);
    5454            virtual ~FusionMunition() {}
    5555    };

  • code/branches/core6/src/modules/weapons/munitions/LaserMunition.cc

    r8855 r9629  
    3939    CreateFactory(LaserMunition);
    4040
    41     LaserMunition::LaserMunition(BaseObject* creator) : ReplenishingMunition(creator)
     41    LaserMunition::LaserMunition(Context* context) : ReplenishingMunition(context)
    4242    {
    4343        RegisterObject(LaserMunition);

  • code/branches/core6/src/modules/weapons/munitions/LaserMunition.h

    r8855 r9629  
    5151    {
    5252        public:
    53             LaserMunition(BaseObject* creator);
     53            LaserMunition(Context* context);
    5454            virtual ~LaserMunition() {}
    5555    };

  • code/branches/core6/src/modules/weapons/munitions/ReplenishingMunition.cc

    r8855 r9629  
    4141    CreateFactory(ReplenishingMunition);
    4242
    43     ReplenishingMunition::ReplenishingMunition(BaseObject* creator) : Munition(creator)
     43    ReplenishingMunition::ReplenishingMunition(Context* context) : Munition(context)
    4444    {
    4545        RegisterObject(ReplenishingMunition);

  • code/branches/core6/src/modules/weapons/munitions/ReplenishingMunition.h

    r8855 r9629  
    5353    {
    5454        public:
    55             ReplenishingMunition(BaseObject* creator);
     55            ReplenishingMunition(Context* context);
    5656            virtual ~ReplenishingMunition() {}
    5757

  • code/branches/core6/src/modules/weapons/munitions/RocketMunition.cc

    r8855 r9629  
    3939    CreateFactory(RocketMunition);
    4040
    41     RocketMunition::RocketMunition(BaseObject* creator) : Munition(creator)
     41    RocketMunition::RocketMunition(Context* context) : Munition(context)
    4242    {
    4343        RegisterObject(RocketMunition);

  • code/branches/core6/src/modules/weapons/munitions/RocketMunition.h

    r8855 r9629  
    5151    {
    5252        public:
    53             RocketMunition(BaseObject* creator);
     53            RocketMunition(Context* context);
    5454            virtual ~RocketMunition() {}
    5555    };

  • code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc

    r9567 r9629  
    106106                {
    107107                    {
    108                         ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getCreator());
     108                        ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
    109109                        effect->setPosition(entity->getPosition());
    110110                        effect->setOrientation(entity->getOrientation());
    … …  
    115115                    // Second effect with same condition
    116116                    {
    117                         ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getCreator());
     117                        ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
    118118                        effect->setPosition(entity->getPosition());
    119119                        effect->setOrientation(entity->getOrientation());
    … …  
    127127                if (victim && victim->hasShield() && (this->getDamage() > 0.0f || this->getShieldDamage() > 0.0f) && victim->getHealth() > 0.0f)
    128128                {
    129                     ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getCreator());
     129                    ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
    130130                    effect->setDestroyAfterLife(true);
    131131                    effect->setSource("Orxonox/Shield");

  • code/branches/core6/src/modules/weapons/projectiles/BillboardProjectile.cc

    r8855 r9629  
    4242    CreateFactory(BillboardProjectile);
    4343
    44     BillboardProjectile::BillboardProjectile(BaseObject* creator) : Projectile(creator)
     44    BillboardProjectile::BillboardProjectile(Context* context) : Projectile(context)
    4545    {
    4646        RegisterObject(BillboardProjectile);

  • code/branches/core6/src/modules/weapons/projectiles/BillboardProjectile.h

    r8855 r9629  
    5555    {
    5656        public:
    57             BillboardProjectile(BaseObject* creator);
     57            BillboardProjectile(Context* context);
    5858            virtual ~BillboardProjectile();
    5959

  • code/branches/core6/src/modules/weapons/projectiles/LightningGunProjectile.cc

    r8855 r9629  
    4242    CreateFactory(LightningGunProjectile);
    4343
    44     LightningGunProjectile::LightningGunProjectile(BaseObject* creator) : BillboardProjectile(creator)
     44    LightningGunProjectile::LightningGunProjectile(Context* context) : BillboardProjectile(context)
    4545    {
    4646        RegisterObject(LightningGunProjectile);

  • code/branches/core6/src/modules/weapons/projectiles/LightningGunProjectile.h

    r8855 r9629  
    5555    {
    5656        public:
    57             LightningGunProjectile(BaseObject* creator);
     57            LightningGunProjectile(Context* context);
    5858            virtual ~LightningGunProjectile() {}
    5959

  • code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.cc

    r9589 r9629  
    4343    CreateFactory(ParticleProjectile);
    4444
    45     ParticleProjectile::ParticleProjectile(BaseObject* creator) : BillboardProjectile(creator)
     45    ParticleProjectile::ParticleProjectile(Context* context) : BillboardProjectile(context)
    4646    {
    4747        RegisterObject(ParticleProjectile);

  • code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.h

    r8855 r9629  
    5151    {
    5252        public:
    53             ParticleProjectile(BaseObject* creator);
     53            ParticleProjectile(Context* context);
    5454            virtual ~ParticleProjectile();
    5555            virtual void changedVisibility();

  • code/branches/core6/src/modules/weapons/projectiles/Projectile.cc

    r9558 r9629  
    4646    CreateFactory(Projectile);
    4747
    48     Projectile::Projectile(BaseObject* creator) : MovableEntity(creator), BasicProjectile()
     48    Projectile::Projectile(Context* context) : MovableEntity(context), BasicProjectile()
    4949    {
    5050        RegisterObject(Projectile);
    … …  
    6060            this->setCollisionType(Kinematic);
    6161
    62             SphereCollisionShape* shape = new SphereCollisionShape(this);
     62            SphereCollisionShape* shape = new SphereCollisionShape(this->getContext());
    6363            shape->setRadius(20.0f);
    6464            this->attachCollisionShape(shape);

  • code/branches/core6/src/modules/weapons/projectiles/Projectile.h

    r8855 r9629  
    5858    {
    5959        public:
    60             Projectile(BaseObject* creator);
     60            Projectile(Context* context);
    6161            virtual ~Projectile();
    6262

  • code/branches/core6/src/modules/weapons/projectiles/Rocket.cc

    r9016 r9629  
    5757        Constructor. Registers the object and initializes some default values.
    5858    */
    59     Rocket::Rocket(BaseObject* creator)
    60         : ControllableEntity(creator)
     59    Rocket::Rocket(Context* context)
     60        : ControllableEntity(context)
    6161        , BasicProjectile()
    62         , RadarViewable(creator, static_cast<WorldEntity*>(this))
     62        , RadarViewable(this, static_cast<WorldEntity*>(this))
    6363    {
    6464        RegisterObject(Rocket);// Register the Rocket class to the core
    … …  
    7373
    7474            // Create rocket model
    75             Model* model = new Model(this);
     75            Model* model = new Model(this->getContext());
    7676            model->setMeshSource("rocket.mesh");
    7777            model->scale(0.7f);
    … …  
    7979
    8080            // Add effects.
    81             ParticleEmitter* fire = new ParticleEmitter(this);
     81            ParticleEmitter* fire = new ParticleEmitter(this->getContext());
    8282            this->attach(fire);
    8383            fire->setOrientation(this->getOrientation());
    … …  
    8989
    9090            // Add collision shape
    91             ConeCollisionShape* collisionShape = new ConeCollisionShape(this);
     91            ConeCollisionShape* collisionShape = new ConeCollisionShape(this->getContext());
    9292            collisionShape->setRadius(3);
    9393            collisionShape->setHeight(500);
    … …  
    9797
    9898            // Add sound
    99             this->defSndWpnEngine_ = new WorldSound(this);
     99            this->defSndWpnEngine_ = new WorldSound(this->getContext());
    100100            this->defSndWpnEngine_->setLooping(true);
    101101            this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
    … …  
    103103            this->attach(defSndWpnEngine_);
    104104
    105             this->defSndWpnLaunch_ = new WorldSound(this);
     105            this->defSndWpnLaunch_ = new WorldSound(this->getContext());
    106106            this->defSndWpnLaunch_->setLooping(false);
    107107            this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
    … …  
    116116
    117117        // Add camera
    118         CameraPosition* camPosition = new CameraPosition(this);
     118        CameraPosition* camPosition = new CameraPosition(this->getContext());
    119119        camPosition->setPosition(0,4,15);
    120120        camPosition->setAllowMouseLook(true);
    … …  
    226226        if(this->getShooter())
    227227        {
    228             effect1 = new ParticleSpawner(this->getShooter()->getCreator());
    229             effect2 = new ParticleSpawner(this->getShooter()->getCreator());
     228            effect1 = new ParticleSpawner(this->getShooter()->getContext());
     229            effect2 = new ParticleSpawner(this->getShooter()->getContext());
    230230        }
    231231        else
    232232        {
    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());
    235235        }
    236236

  • code/branches/core6/src/modules/weapons/projectiles/Rocket.h

    r9016 r9629  
    5959    {
    6060        public:
    61             Rocket(BaseObject* creator);
     61            Rocket(Context* context);
    6262            virtual ~Rocket();
    6363

  • code/branches/core6/src/modules/weapons/projectiles/SimpleRocket.cc

    r8859 r9629  
    5656    const float SimpleRocket::FUEL_PERCENTAGE = 0.8f;
    5757
    58     SimpleRocket::SimpleRocket(BaseObject* creator)
    59         : ControllableEntity(creator)
     58    SimpleRocket::SimpleRocket(Context* context)
     59        : ControllableEntity(context)
    6060        , BasicProjectile()
    61         , RadarViewable(creator, static_cast<WorldEntity*>(this))
     61        , RadarViewable(this, static_cast<WorldEntity*>(this))
    6262    {
    6363        RegisterObject(SimpleRocket);// Register the SimpleRocket class to the core
    … …  
    7474
    7575            // Create rocket model.
    76             Model* model = new Model(this);
     76            Model* model = new Model(this->getContext());
    7777            model->setMeshSource("rocket.mesh");
    7878            model->scale(0.7f);
    … …  
    8080
    8181            // Add effects.
    82             this->fire_ = new ParticleEmitter(this);
     82            this->fire_ = new ParticleEmitter(this->getContext());
    8383            this->attach(this->fire_);
    8484
    … …  
    9191            // Add collision shape.
    9292            // 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());
    9494            collisionShape->setOrientation(this->getOrientation());
    9595            collisionShape->setRadius(1.5f);

  • code/branches/core6/src/modules/weapons/projectiles/SimpleRocket.h

    r8859 r9629  
    6060    {
    6161        public:
    62             SimpleRocket(BaseObject* creator);
     62            SimpleRocket(Context* context);
    6363            virtual ~SimpleRocket();
    6464            virtual void tick(float dt);

  • code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.cc

    r8855 r9629  
    5151    CreateFactory(EnergyDrink);
    5252
    53     EnergyDrink::EnergyDrink(BaseObject* creator) : WeaponMode(creator)
     53    EnergyDrink::EnergyDrink(Context* context) : WeaponMode(context)
    5454    {
    5555        RegisterObject(EnergyDrink);
    … …  
    101101    {
    102102        // 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());
    105105        model->setMeshSource("can.mesh");
    106106        model->setCastShadows(false);
    … …  
    127127    void EnergyDrink::muzzleflash()
    128128    {
    129         MuzzleFlash *muzzleFlash = new MuzzleFlash(this);
     129        MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext());
    130130        this->getWeapon()->attach(muzzleFlash);
    131131        muzzleFlash->setPosition(this->getMuzzleOffset());

  • code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.h

    r8855 r9629  
    5454    {
    5555        public:
    56             EnergyDrink(BaseObject* creator);
     56            EnergyDrink(Context* context);
    5757            virtual ~EnergyDrink() {}
    5858

  • code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.cc

    r8855 r9629  
    4848    CreateFactory(FusionFire);
    4949
    50     FusionFire::FusionFire(BaseObject* creator) : WeaponMode(creator)
     50    FusionFire::FusionFire(Context* context) : WeaponMode(context)
    5151    {
    5252        RegisterObject(FusionFire);
    … …  
    6666    void FusionFire::fire()
    6767    {
    68         BillboardProjectile* projectile = new BillboardProjectile(this);
     68        BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
    6969
    7070        projectile->setOrientation(this->getMuzzleOrientation());

  • code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.h

    r8855 r9629  
    5151    {
    5252        public:
    53             FusionFire(BaseObject* creator);
     53            FusionFire(Context* context);
    5454            virtual ~FusionFire() {}
    5555

  • code/branches/core6/src/modules/weapons/weaponmodes/HsW01.cc

    r9526 r9629  
    5252    CreateFactory(HsW01);
    5353
    54     HsW01::HsW01(BaseObject* creator) : WeaponMode(creator)
     54    HsW01::HsW01(Context* context) : WeaponMode(context)
    5555    {
    5656        RegisterObject(HsW01);
    … …  
    111111
    112112        // 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());
    115115        model->setMeshSource(mesh_);
    116116        model->setCastShadows(false);
    … …  
    138138    void HsW01::muzzleflash()
    139139    {
    140         MuzzleFlash *muzzleFlash = new MuzzleFlash(this);
     140        MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext());
    141141        this->getWeapon()->attach(muzzleFlash);
    142142        muzzleFlash->setPosition(this->getMuzzleOffset());

  • code/branches/core6/src/modules/weapons/weaponmodes/HsW01.h

    r9526 r9629  
    5353    {
    5454        public:
    55             HsW01(BaseObject* creator);
     55            HsW01(Context* context);
    5656            virtual ~HsW01();
    5757

  • code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.cc

    r8855 r9629  
    4747    CreateFactory(LaserFire);
    4848
    49     LaserFire::LaserFire(BaseObject* creator) : WeaponMode(creator)
     49    LaserFire::LaserFire(Context* context) : WeaponMode(context)
    5050    {
    5151        RegisterObject(LaserFire);
    … …  
    6464    void LaserFire::fire()
    6565    {
    66         ParticleProjectile* projectile = new ParticleProjectile(this);
     66        ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
    6767
    6868        projectile->setOrientation(this->getMuzzleOrientation());

  • code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.h

    r8855 r9629  
    5151    {
    5252        public:
    53             LaserFire(BaseObject* creator);
     53            LaserFire(Context* context);
    5454            virtual ~LaserFire() {}
    5555

  • code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.cc

    r9016 r9629  
    4646    CreateFactory(LightningGun);
    4747
    48     LightningGun::LightningGun(BaseObject* creator) : WeaponMode(creator)
     48    LightningGun::LightningGun(Context* context) : WeaponMode(context)
    4949    {
    5050        RegisterObject(LightningGun);
    … …  
    6868    void LightningGun::fire()
    6969    {
    70         LightningGunProjectile* projectile = new LightningGunProjectile(this);
     70        LightningGunProjectile* projectile = new LightningGunProjectile(this->getContext());
    7171        projectile->setMaterial("Flares/LightningBall_");
    7272

  • code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.h

    r8855 r9629  
    5151    {
    5252        public:
    53             LightningGun(BaseObject* creator);
     53            LightningGun(Context* context);
    5454            virtual ~LightningGun();
    5555

  • code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.cc

    r8855 r9629  
    4848    CreateFactory(RocketFire);
    4949
    50     RocketFire::RocketFire(BaseObject* creator) : WeaponMode(creator)
     50    RocketFire::RocketFire(Context* context) : WeaponMode(context)
    5151    {
    5252        RegisterObject(RocketFire);
    … …  
    7171    void RocketFire::fire()
    7272    {
    73         Rocket* rocket = new Rocket(this);
     73        Rocket* rocket = new Rocket(this->getContext());
    7474
    7575        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());

  • code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.h

    r8855 r9629  
    5151    {
    5252        public:
    53             RocketFire(BaseObject* creator);
     53            RocketFire(Context* context);
    5454            virtual ~RocketFire();
    5555

  • code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

    r8855 r9629  
    5252    CreateFactory(SimpleRocketFire);
    5353
    54     SimpleRocketFire::SimpleRocketFire(BaseObject* creator) : WeaponMode(creator)
     54    SimpleRocketFire::SimpleRocketFire(Context* context) : WeaponMode(context)
    5555    {
    5656        RegisterObject(SimpleRocketFire);
    … …  
    7676    void SimpleRocketFire::fire()
    7777    {
    78         RocketController* controller = new RocketController(this);
     78        RocketController* controller = new RocketController(this->getContext());
    7979        SimpleRocket* rocket = controller->getRocket();
    8080        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());

  • code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.h

    r8855 r9629  
    5050    {
    5151        public:
    52             SimpleRocketFire(BaseObject* creator);
     52            SimpleRocketFire(Context* context);
    5353            virtual ~SimpleRocketFire();
    5454            void deactivateFire();

  • code/branches/core6/src/orxonox/Level.cc

    r9016 r9629  
    4545    CreateFactory(Level);
    4646
    47     Level::Level(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     47    Level::Level(Context* context) : BaseObject(context), Synchronisable(context), Context(context)
    4848    {
    4949        RegisterObject(Level);

  • code/branches/core6/src/orxonox/Level.h

    r9016 r9629  
    4141namespace orxonox
    4242{
    43     class _OrxonoxExport Level : public BaseObject, public Synchronisable
     43    class _OrxonoxExport Level : public BaseObject, public Synchronisable, public Context
    4444    {
    4545        public:
    46             Level(BaseObject* creator);
     46            Level(Context* context);
    4747            virtual ~Level();
    4848

  • code/branches/core6/src/orxonox/LevelInfo.cc

    r9348 r9629  
    250250        The creator of this object.
    251251    */
    252     LevelInfo::LevelInfo(BaseObject* creator) : BaseObject(creator)
     252    LevelInfo::LevelInfo(Context* context) : BaseObject(context)
    253253    {
    254254        RegisterObject(LevelInfo);

  • code/branches/core6/src/orxonox/LevelInfo.h

    r9585 r9629  
    204204    {
    205205        public:
    206             LevelInfo(BaseObject* creator);
     206            LevelInfo(Context* context);
    207207            virtual ~LevelInfo();
    208208

  • code/branches/core6/src/orxonox/Scene.cc

    r9348 r9629  
    5353    CreateFactory(Scene);
    5454
    55     Scene::Scene(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     55    Scene::Scene(Context* context) : BaseObject(context), Synchronisable(context), Context(context)
    5656    {
    5757        RegisterObject(Scene);

  • code/branches/core6/src/orxonox/Scene.h

    r6417 r9629  
    4545namespace orxonox
    4646{
    47     class _OrxonoxExport Scene : public BaseObject, public Synchronisable, public Tickable
     47    class _OrxonoxExport Scene : public BaseObject, public Synchronisable, public Tickable, public Context
    4848    {
    4949        public:
    50             Scene(BaseObject* creator);
     50            Scene(Context* context);
    5151            virtual ~Scene();
    5252

  • code/branches/core6/src/orxonox/Test.cc

    r9558 r9629  
    5656    Test* Test::instance_ = 0;
    5757
    58     Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     58    Test::Test(Context* context) : BaseObject(context), Synchronisable(context)
    5959    {
    6060        assert(instance_==0);

  • code/branches/core6/src/orxonox/Test.h

    r8858 r9629  
    4646  {
    4747    public:
    48       Test(BaseObject* creator);
     48      Test(Context* context);
    4949      virtual ~Test();
    5050

  • code/branches/core6/src/orxonox/chat/ChatHistory.cc

    r8858 r9629  
    3939  /* constructor */
    4040#ifndef CHATTEST
    41   //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator)
    4241  ChatHistory::ChatHistory()
    4342#else

  • code/branches/core6/src/orxonox/collisionshapes/CollisionShape.cc

    r8858 r9629  
    4949        Constructor. Registers and initializes the object.
    5050    */
    51     CollisionShape::CollisionShape(BaseObject* creator)
    52         : BaseObject(creator)
    53         , Synchronisable(creator)
     51    CollisionShape::CollisionShape(Context* context)
     52        : BaseObject(context)
     53        , Synchronisable(context)
    5454    {
    5555        RegisterObject(CollisionShape);

  • code/branches/core6/src/orxonox/collisionshapes/CollisionShape.h

    r8706 r9629  
    5858    {
    5959        public:
    60             CollisionShape(BaseObject* creator);
     60            CollisionShape(Context* context);
    6161            virtual ~CollisionShape();
    6262

  • code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.cc

    r8858 r9629  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     CompoundCollisionShape::CompoundCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    CompoundCollisionShape::CompoundCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(CompoundCollisionShape);

  • code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.h

    r8706 r9629  
    5858    {
    5959        public:
    60             CompoundCollisionShape(BaseObject* creator);
     60            CompoundCollisionShape(Context* context);
    6161            virtual ~CompoundCollisionShape();
    6262

  • code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

    r9612 r9629  
    3737namespace orxonox
    3838{
    39     WorldEntityCollisionShape::WorldEntityCollisionShape(BaseObject* creator) : CompoundCollisionShape(creator)
     39    WorldEntityCollisionShape::WorldEntityCollisionShape(Context* context) : CompoundCollisionShape(context)
    4040    {
    4141        RegisterObject(WorldEntityCollisionShape);

  • code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.h

    r9612 r9629  
    3838    {
    3939        public:
    40             WorldEntityCollisionShape(BaseObject* creator);
     40            WorldEntityCollisionShape(Context* context);
    4141            virtual ~WorldEntityCollisionShape();
    4242

  • code/branches/core6/src/orxonox/controllers/AIController.cc

    r9016 r9629  
    4141    CreateFactory(AIController);
    4242
    43     AIController::AIController(BaseObject* creator) : ArtificialController(creator)
     43    AIController::AIController(Context* context) : ArtificialController(context)
    4444    {
    4545        RegisterObject(AIController);

  • code/branches/core6/src/orxonox/controllers/AIController.h

    r9016 r9629  
    4141    {
    4242        public:
    43             AIController(BaseObject* creator);
     43            AIController(Context* context);
    4444            virtual ~AIController();
    4545

  • code/branches/core6/src/orxonox/controllers/ArtificialController.cc

    r9252 r9629  
    4545    SetConsoleCommand("ArtificialController", "setbotlevel",      &ArtificialController::setAllBotLevel);
    4646
    47     ArtificialController::ArtificialController(BaseObject* creator) : FormationController(creator)
     47    ArtificialController::ArtificialController(Context* context) : FormationController(context)
    4848    {
    4949        RegisterObject(ArtificialController);

  • code/branches/core6/src/orxonox/controllers/ArtificialController.h

    r9252 r9629  
    3939    {
    4040        public:
    41             ArtificialController(BaseObject* creator);
     41            ArtificialController(Context* context);
    4242            virtual ~ArtificialController();
    4343

  • code/branches/core6/src/orxonox/controllers/Controller.cc

    r6417 r9629  
    3535    CreateUnloadableFactory(Controller);
    3636
    37     Controller::Controller(BaseObject* creator) : BaseObject(creator)
     37    Controller::Controller(Context* context) : BaseObject(context)
    3838    {
    3939        RegisterObject(Controller);

  • code/branches/core6/src/orxonox/controllers/Controller.h

    r8706 r9629  
    4242
    4343        public:
    44             Controller(BaseObject* creator);
     44            Controller(Context* context);
    4545            virtual ~Controller();
    4646

  • code/branches/core6/src/orxonox/controllers/DroneController.cc

    r8891 r9629  
    4545    const float DroneController::ACTION_INTERVAL = 1.0f;
    4646
    47     DroneController::DroneController(BaseObject* creator) : ArtificialController(creator)
     47    DroneController::DroneController(Context* context) : ArtificialController(context)
    4848    {
    4949        RegisterObject(DroneController);

  • code/branches/core6/src/orxonox/controllers/DroneController.h

    r9557 r9629  
    5050    {
    5151        public:
    52             DroneController(BaseObject* creator);
     52            DroneController(Context* context);
    5353            virtual ~DroneController();
    5454

  • code/branches/core6/src/orxonox/controllers/FormationController.cc

    r9348 r9629  
    6969    static const float ROTATEFACTOR_FREE = 0.8f;
    7070
    71     FormationController::FormationController(BaseObject* creator) : Controller(creator)
     71    FormationController::FormationController(Context* context) : Controller(context)
    7272    {
    7373        RegisterObject(FormationController);

  • code/branches/core6/src/orxonox/controllers/FormationController.h

    r9567 r9629  
    4646
    4747      public:
    48       FormationController(BaseObject* creator);
     48      FormationController(Context* context);
    4949
    5050      virtual ~FormationController();

  • code/branches/core6/src/orxonox/controllers/HumanController.cc

    r9256 r9629  
    7171    /*static*/ const float HumanController::BOOSTING_TIME = 0.1f;
    7272
    73     HumanController::HumanController(BaseObject* creator) : FormationController(creator)
     73    HumanController::HumanController(Context* context) : FormationController(context)
    7474    {
    7575        RegisterObject(HumanController);

  • code/branches/core6/src/orxonox/controllers/HumanController.h

    r9256 r9629  
    4444    { // tolua_export
    4545        public:
    46             HumanController(BaseObject* creator);
     46            HumanController(Context* context);
    4747            virtual ~HumanController();
    4848

  • code/branches/core6/src/orxonox/controllers/NewHumanController.cc

    r9348 r9629  
    6060    NewHumanController* NewHumanController::localController_s = 0;
    6161
    62     NewHumanController::NewHumanController(BaseObject* creator)
    63         : HumanController(creator)
     62    NewHumanController::NewHumanController(Context* context)
     63        : HumanController(context)
    6464        , crossHairOverlay_(NULL)
    6565        , centerOverlay_(NULL)
    … …  
    9898        if (GameMode::showsGraphics())
    9999        {
    100             crossHairOverlay_ = new OrxonoxOverlay(this);
     100            crossHairOverlay_ = new OrxonoxOverlay(this->getContext());
    101101            crossHairOverlay_->setBackgroundMaterial("Orxonox/Crosshair3");
    102102            crossHairOverlay_->setSize(Vector2(overlaySize_, overlaySize_));
    … …  
    104104            //crossHairOverlay_->setAspectCorrection(true); not working
    105105
    106             centerOverlay_ = new OrxonoxOverlay(this);
     106            centerOverlay_ = new OrxonoxOverlay(this->getContext());
    107107            centerOverlay_->setBackgroundMaterial("Orxonox/CenterOverlay");
    108108            centerOverlay_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f));
    … …  
    112112            if (showDamageOverlay_)
    113113            {
    114                 damageOverlayTop_ = new OrxonoxOverlay(this);
     114                damageOverlayTop_ = new OrxonoxOverlay(this->getContext());
    115115                damageOverlayTop_->setBackgroundMaterial("Orxonox/DamageOverlayTop");
    116116                damageOverlayTop_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f));
    … …  
    118118                damageOverlayTop_->hide();
    119119
    120                 damageOverlayRight_ = new OrxonoxOverlay(this);
     120                damageOverlayRight_ = new OrxonoxOverlay(this->getContext());
    121121                damageOverlayRight_->setBackgroundMaterial("Orxonox/DamageOverlayRight");
    122122                damageOverlayRight_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f));
    … …  
    124124                damageOverlayRight_->hide();
    125125
    126                 damageOverlayBottom_ = new OrxonoxOverlay(this);
     126                damageOverlayBottom_ = new OrxonoxOverlay(this->getContext());
    127127                damageOverlayBottom_->setBackgroundMaterial("Orxonox/DamageOverlayBottom");
    128128                damageOverlayBottom_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f));
    … …  
    130130                damageOverlayBottom_->hide();
    131131
    132                 damageOverlayLeft_ = new OrxonoxOverlay(this);
     132                damageOverlayLeft_ = new OrxonoxOverlay(this->getContext());
    133133                damageOverlayLeft_->setBackgroundMaterial("Orxonox/DamageOverlayLeft");
    134134                damageOverlayLeft_->setSize(Vector2(overlaySize_ * 2.5f, overlaySize_ * 2.5f));
    … …  
    139139            if (showArrows_)
    140140            {
    141                 arrowsOverlay1_ = new OrxonoxOverlay(this);
     141                arrowsOverlay1_ = new OrxonoxOverlay(this->getContext());
    142142                arrowsOverlay1_->setBackgroundMaterial("Orxonox/DirectionArrows1");
    143143                arrowsOverlay1_->setSize(Vector2(0.02727f, 0.36f * arrowsSize_));
    … …  
    146146                arrowsOverlay1_->hide();
    147147
    148                 arrowsOverlay2_ = new OrxonoxOverlay(this);
     148                arrowsOverlay2_ = new OrxonoxOverlay(this->getContext());
    149149                arrowsOverlay2_->setBackgroundMaterial("Orxonox/DirectionArrows2");
    150150                arrowsOverlay2_->setSize(Vector2(0.02727f, 0.59f * arrowsSize_));
    … …  
    153153                arrowsOverlay2_->hide();
    154154
    155                 arrowsOverlay3_ = new OrxonoxOverlay(this);
     155                arrowsOverlay3_ = new OrxonoxOverlay(this->getContext());
    156156                arrowsOverlay3_->setBackgroundMaterial("Orxonox/DirectionArrows3");
    157157                arrowsOverlay3_->setSize(Vector2(0.02727f, 0.77f * arrowsSize_));
    … …  
    160160                arrowsOverlay3_->hide();
    161161
    162                 arrowsOverlay4_ = new OrxonoxOverlay(this);
     162                arrowsOverlay4_ = new OrxonoxOverlay(this->getContext());
    163163                arrowsOverlay4_->setBackgroundMaterial("Orxonox/DirectionArrows4");
    164164                arrowsOverlay4_->setSize(Vector2(0.02727f, arrowsSize_));

  • code/branches/core6/src/orxonox/controllers/NewHumanController.h

    r9016 r9629  
    4242    {
    4343        public:
    44             NewHumanController(BaseObject* creator);
     44            NewHumanController(Context* context);
    4545            virtual ~NewHumanController();
    4646

  • code/branches/core6/src/orxonox/controllers/ScriptController.cc

    r5781 r9629  
    3434    CreateFactory(ScriptController);
    3535
    36     ScriptController::ScriptController(BaseObject* creator) : ArtificialController(creator)
     36    ScriptController::ScriptController(Context* context) : ArtificialController(context)
    3737    {
    3838        RegisterObject(ScriptController);

  • code/branches/core6/src/orxonox/controllers/ScriptController.h

    r5781 r9629  
    3838    {
    3939        public:
    40             ScriptController(BaseObject* creator);
     40            ScriptController(Context* context);
    4141            virtual ~ScriptController() { }
    4242

  • code/branches/core6/src/orxonox/controllers/WaypointController.cc

    r9252 r9629  
    3636    CreateFactory(WaypointController);
    3737
    38     WaypointController::WaypointController(BaseObject* creator) : ArtificialController(creator)
     38    WaypointController::WaypointController(Context* context) : ArtificialController(context)
    3939    {
    4040        RegisterObject(WaypointController);

  • code/branches/core6/src/orxonox/controllers/WaypointController.h

    r9252 r9629  
    4141    {
    4242        public:
    43             WaypointController(BaseObject* creator);
     43            WaypointController(Context* context);
    4444            virtual ~WaypointController();
    4545

  • code/branches/core6/src/orxonox/controllers/WaypointPatrolController.cc

    r9016 r9629  
    3838    CreateFactory(WaypointPatrolController);
    3939
    40     WaypointPatrolController::WaypointPatrolController(BaseObject* creator) : WaypointController(creator)
     40    WaypointPatrolController::WaypointPatrolController(Context* context) : WaypointController(context)
    4141    {
    4242        RegisterObject(WaypointPatrolController);

  • code/branches/core6/src/orxonox/controllers/WaypointPatrolController.h

    r9016 r9629  
    4040    {
    4141        public:
    42             WaypointPatrolController(BaseObject* creator);
     42            WaypointPatrolController(Context* context);
    4343            virtual ~WaypointPatrolController() {}
    4444

  • code/branches/core6/src/orxonox/gametypes/Asteroids.cc

    r8858 r9629  
    3737    CreateUnloadableFactory(Asteroids);
    3838
    39     Asteroids::Asteroids(BaseObject* creator) : Gametype(creator)
     39    Asteroids::Asteroids(Context* context) : Gametype(context)
    4040    {
    4141        RegisterObject(Asteroids);

  • code/branches/core6/src/orxonox/gametypes/Asteroids.h

    r5781 r9629  
    3838    {
    3939        public:
    40             Asteroids(BaseObject* creator);
     40            Asteroids(Context* context);
    4141            virtual ~Asteroids() {}
    4242

  • code/branches/core6/src/orxonox/gametypes/Deathmatch.cc

    r9348 r9629  
    3838    CreateUnloadableFactory(Deathmatch);
    3939
    40     Deathmatch::Deathmatch(BaseObject* creator) : Gametype(creator)
     40    Deathmatch::Deathmatch(Context* context) : Gametype(context)
    4141    {
    4242        RegisterObject(Deathmatch);

  • code/branches/core6/src/orxonox/gametypes/Deathmatch.h

    r9348 r9629  
    3838    {
    3939        public:
    40             Deathmatch(BaseObject* creator);
     40            Deathmatch(Context* context);
    4141            virtual ~Deathmatch() {}
    4242

  • code/branches/core6/src/orxonox/gametypes/Dynamicmatch.cc

    r9558 r9629  
    6464    CreateUnloadableFactory(Dynamicmatch);
    6565
    66     Dynamicmatch::Dynamicmatch(BaseObject* creator) : Gametype(creator)
     66    Dynamicmatch::Dynamicmatch(Context* context) : Gametype(context)
    6767    {
    6868        RegisterObject(Dynamicmatch);

  • code/branches/core6/src/orxonox/gametypes/Dynamicmatch.h

    r9348 r9629  
    4444    {
    4545        public:
    46             Dynamicmatch(BaseObject* creator);
     46            Dynamicmatch(Context* context);
    4747            virtual ~Dynamicmatch() {}
    4848

  • code/branches/core6/src/orxonox/gametypes/Gametype.cc

    r9558 r9629  
    4949    CreateUnloadableFactory(Gametype);
    5050
    51     Gametype::Gametype(BaseObject* creator) : BaseObject(creator)
     51    Gametype::Gametype(Context* context) : BaseObject(context)
    5252    {
    5353        RegisterObject(Gametype);
    5454
    55         this->gtinfo_ = new GametypeInfo(creator);
     55        this->gtinfo_ = new GametypeInfo(context);
    5656
    5757        this->setGametype(SmartPtr<Gametype>(this, false));
    … …  
    7474        if (GameMode::showsGraphics() && !this->scoreboardTemplate_.empty())
    7575        {
    76             this->scoreboard_ = new OverlayGroup(this);
     76            this->scoreboard_ = new OverlayGroup(context);
    7777            this->scoreboard_->addTemplate(this->scoreboardTemplate_);
    7878            this->scoreboard_->setGametype(this);
    … …  
    160160                ControllableEntity* oldentity = it->first->getControllableEntity();
    161161
    162                 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity);
     162                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity->getContext());
    163163                if (oldentity->getCamera())
    164164                {
    … …  
    283283                    this->gtinfo_->pawnKilled(victim->getPlayer());
    284284
    285                 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
     285                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getContext());
    286286                if (victim->getCamera())
    287287                {
    … …  
    458458        {
    459459            // force spawn at spawnpoint with default pawn
    460             ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn);
     460            ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn->getContext());
    461461            spawn->spawn(entity);
    462462            player->startControl(entity);
    … …  
    472472    {
    473473        for (unsigned int i = 0; i < amount; ++i)
    474             this->botclass_.fabricate(this);
     474            this->botclass_.fabricate(this->getContext());
    475475    }
    476476

  • code/branches/core6/src/orxonox/gametypes/Gametype.h

    r9563 r9629  
    6767
    6868        public:
    69             Gametype(BaseObject* creator);
     69            Gametype(Context* context);
    7070            virtual ~Gametype();
    7171

  • code/branches/core6/src/orxonox/gametypes/LastManStanding.cc

    r9558 r9629  
    4040    CreateUnloadableFactory(LastManStanding);
    4141
    42     LastManStanding::LastManStanding(BaseObject* creator) : Deathmatch(creator)
     42    LastManStanding::LastManStanding(Context* context) : Deathmatch(context)
    4343    {
    4444        RegisterObject(LastManStanding);

  • code/branches/core6/src/orxonox/gametypes/LastManStanding.h

    r7655 r9629  
    6565
    6666        public:
    67             LastManStanding(BaseObject* creator); //!< Default Constructor.
     67            LastManStanding(Context* context); //!< Default Constructor.
    6868            virtual ~LastManStanding() {} //!< Default Destructor.
    6969            void setConfigValues(); //!< Makes values configurable.

  • code/branches/core6/src/orxonox/gametypes/LastTeamStanding.cc

    r9558 r9629  
    4040    CreateUnloadableFactory(LastTeamStanding);
    4141
    42     LastTeamStanding::LastTeamStanding(BaseObject* creator) : TeamDeathmatch(creator)
     42    LastTeamStanding::LastTeamStanding(Context* context) : TeamDeathmatch(context)
    4343    {
    4444        RegisterObject(LastTeamStanding);

  • code/branches/core6/src/orxonox/gametypes/LastTeamStanding.h

    r8351 r9629  
    7171
    7272        public:
    73             LastTeamStanding(BaseObject* creator); //!< Default Constructor.
     73            LastTeamStanding(Context* context); //!< Default Constructor.
    7474            virtual ~LastTeamStanding(); //!< Default Destructor.
    7575

  • code/branches/core6/src/orxonox/gametypes/Mission.cc

    r9348 r9629  
    3939    CreateUnloadableFactory(Mission);
    4040
    41     Mission::Mission(BaseObject* creator) : TeamGametype(creator)
     41    Mission::Mission(Context* context) : TeamGametype(context)
    4242    {
    4343        RegisterObject(Mission);

  • code/branches/core6/src/orxonox/gametypes/Mission.h

    r9348 r9629  
    3939    {
    4040        public:
    41             Mission(BaseObject* creator);
     41            Mission(Context* context);
    4242            virtual ~Mission() {}
    4343

  • code/branches/core6/src/orxonox/gametypes/TeamBaseMatch.cc

    r9348 r9629  
    3838    CreateUnloadableFactory(TeamBaseMatch);
    3939
    40     TeamBaseMatch::TeamBaseMatch(BaseObject* creator) : TeamDeathmatch(creator)
     40    TeamBaseMatch::TeamBaseMatch(Context* context) : TeamDeathmatch(context)
    4141    {
    4242        RegisterObject(TeamBaseMatch);

  • code/branches/core6/src/orxonox/gametypes/TeamBaseMatch.h

    r9348 r9629  
    4141    {
    4242        public:
    43             TeamBaseMatch(BaseObject* creator);
     43            TeamBaseMatch(Context* context);
    4444            virtual ~TeamBaseMatch() {}
    4545

  • code/branches/core6/src/orxonox/gametypes/TeamDeathmatch.cc

    r9348 r9629  
    3838    CreateUnloadableFactory(TeamDeathmatch);
    3939
    40     TeamDeathmatch::TeamDeathmatch(BaseObject* creator) : TeamGametype(creator)
     40    TeamDeathmatch::TeamDeathmatch(Context* context) : TeamGametype(context)
    4141    {
    4242        RegisterObject(TeamDeathmatch);

  • code/branches/core6/src/orxonox/gametypes/TeamDeathmatch.h

    r9348 r9629  
    3838    {
    3939        public:
    40             TeamDeathmatch(BaseObject* creator);
     40            TeamDeathmatch(Context* context);
    4141            virtual ~TeamDeathmatch() {}
    4242

  • code/branches/core6/src/orxonox/gametypes/TeamGametype.cc

    r9558 r9629  
    4242    CreateUnloadableFactory(TeamGametype);
    4343
    44     TeamGametype::TeamGametype(BaseObject* creator) : Gametype(creator)
     44    TeamGametype::TeamGametype(Context* context) : Gametype(context)
    4545    {
    4646        RegisterObject(TeamGametype);

  • code/branches/core6/src/orxonox/gametypes/TeamGametype.h

    r9348 r9629  
    4141    {
    4242        public:
    43             TeamGametype(BaseObject* creator);
     43            TeamGametype(Context* context);
    4444            virtual ~TeamGametype() {}
    4545

  • code/branches/core6/src/orxonox/gametypes/UnderAttack.cc

    r9558 r9629  
    4040    CreateUnloadableFactory(UnderAttack);
    4141
    42     UnderAttack::UnderAttack(BaseObject* creator) : TeamDeathmatch(creator)
     42    UnderAttack::UnderAttack(Context* context) : TeamDeathmatch(context)
    4343    {
    4444        RegisterObject(UnderAttack);

  • code/branches/core6/src/orxonox/gametypes/UnderAttack.h

    r5929 r9629  
    3939    {
    4040        public:
    41             UnderAttack(BaseObject* creator);
     41            UnderAttack(Context* context);
    4242            virtual ~UnderAttack() {}
    4343

  • code/branches/core6/src/orxonox/graphics/AnimatedModel.cc

    r8858 r9629  
    4141    CreateFactory(AnimatedModel);
    4242
    43     AnimatedModel::AnimatedModel(BaseObject* creator) : Model(creator)
     43    AnimatedModel::AnimatedModel(Context* context) : Model(context)
    4444    {
    4545        RegisterObject(AnimatedModel);

  • code/branches/core6/src/orxonox/graphics/AnimatedModel.h

    r8858 r9629  
    4141    {
    4242        public:
    43             AnimatedModel(BaseObject* creator);
     43            AnimatedModel(Context* context);
    4444            virtual ~AnimatedModel();
    4545

  • code/branches/core6/src/orxonox/graphics/Backlight.cc

    r8424 r9629  
    4747    CreateFactory(Backlight);
    4848
    49     Backlight::Backlight(BaseObject* creator) : FadingBillboard(creator)
     49    Backlight::Backlight(Context* context) : FadingBillboard(context)
    5050    {
    5151        RegisterObject(Backlight);

  • code/branches/core6/src/orxonox/graphics/Backlight.h

    r7163 r9629  
    4141    {
    4242        public:
    43             Backlight(BaseObject* creator);
     43            Backlight(Context* context);
    4444            virtual ~Backlight();
    4545

  • code/branches/core6/src/orxonox/graphics/Billboard.cc

    r8706 r9629  
    4040    CreateFactory(Billboard);
    4141
    42     Billboard::Billboard(BaseObject* creator) : StaticEntity(creator)
     42    Billboard::Billboard(Context* context) : StaticEntity(context)
    4343    {
    4444        RegisterObject(Billboard);

  • code/branches/core6/src/orxonox/graphics/Billboard.h

    r8706 r9629  
    4444    {
    4545        public:
    46             Billboard(BaseObject* creator);
     46            Billboard(Context* context);
    4747            virtual ~Billboard();
    4848

  • code/branches/core6/src/orxonox/graphics/BlinkingBillboard.cc

    r8351 r9629  
    3737    CreateFactory(BlinkingBillboard);
    3838
    39     BlinkingBillboard::BlinkingBillboard(BaseObject* creator) : Billboard(creator)
     39    BlinkingBillboard::BlinkingBillboard(Context* context) : Billboard(context)
    4040    {
    4141        RegisterObject(BlinkingBillboard);

  • code/branches/core6/src/orxonox/graphics/BlinkingBillboard.h

    r8351 r9629  
    4141    {
    4242        public:
    43             BlinkingBillboard(BaseObject* creator);
     43            BlinkingBillboard(Context* context);
    4444            virtual ~BlinkingBillboard();
    4545

  • code/branches/core6/src/orxonox/graphics/Camera.cc

    r9558 r9629  
    4848    CreateFactory(Camera);
    4949
    50     Camera::Camera(BaseObject* creator) : StaticEntity(creator)
     50    Camera::Camera(Context* context) : StaticEntity(context)
    5151    {
    5252        RegisterObject(Camera);

  • code/branches/core6/src/orxonox/graphics/Camera.h

    r8706 r9629  
    4646
    4747        public:
    48             Camera(BaseObject* creator);
     48            Camera(Context* context);
    4949            virtual ~Camera();
    5050

  • code/branches/core6/src/orxonox/graphics/FadingBillboard.cc

    r5929 r9629  
    3636    CreateFactory(FadingBillboard);
    3737
    38     FadingBillboard::FadingBillboard(BaseObject* creator) : Billboard(creator)
     38    FadingBillboard::FadingBillboard(Context* context) : Billboard(context)
    3939    {
    4040        RegisterObject(FadingBillboard);

  • code/branches/core6/src/orxonox/graphics/FadingBillboard.h

    r7163 r9629  
    4242    {
    4343        public:
    44             FadingBillboard(BaseObject* creator);
     44            FadingBillboard(Context* context);
    4545            virtual ~FadingBillboard();
    4646

  • code/branches/core6/src/orxonox/graphics/GlobalShader.cc

    r8079 r9629  
    3838    CreateFactory(GlobalShader);
    3939
    40     GlobalShader::GlobalShader(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     40    GlobalShader::GlobalShader(Context* context) : BaseObject(context), Synchronisable(context)
    4141    {
    4242        RegisterObject(GlobalShader);

  • code/branches/core6/src/orxonox/graphics/GlobalShader.h

    r8079 r9629  
    4141    {
    4242        public:
    43             GlobalShader(BaseObject* creator);
     43            GlobalShader(Context* context);
    4444            virtual ~GlobalShader();
    4545

  • code/branches/core6/src/orxonox/graphics/Light.cc

    r5781 r9629  
    4949    BOOST_STATIC_ASSERT((int)Ogre::Light::LT_SPOTLIGHT   == (int)Light::Spotlight);
    5050
    51     Light::Light(BaseObject* creator) : StaticEntity(creator)
     51    Light::Light(Context* context) : StaticEntity(context)
    5252    {
    5353        RegisterObject(Light);

  • code/branches/core6/src/orxonox/graphics/Light.h

    r7401 r9629  
    5353
    5454        public:
    55             Light(BaseObject* creator);
     55            Light(Context* context);
    5656            virtual ~Light();
    5757

  • code/branches/core6/src/orxonox/graphics/MeshLodInformation.cc

    r7183 r9629  
    4040    CreateFactory(MeshLodInformation);
    4141
    42     MeshLodInformation::MeshLodInformation(BaseObject* creator)
    43     : BaseObject(creator), 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)
    4444    {
    4545        RegisterObject(MeshLodInformation);

  • code/branches/core6/src/orxonox/graphics/MeshLodInformation.h

    r7163 r9629  
    4141    {
    4242        public:
    43             MeshLodInformation(BaseObject* creator);
     43            MeshLodInformation(Context* context);
    4444            virtual ~MeshLodInformation();
    4545

  • code/branches/core6/src/orxonox/graphics/Model.cc

    r9558 r9629  
    4343    CreateFactory(Model);
    4444
    45     Model::Model(BaseObject* creator) :
    46         StaticEntity(creator), 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)
    4747    {
    4848        RegisterObject(Model);

  • code/branches/core6/src/orxonox/graphics/Model.h

    r7166 r9629  
    4141    {
    4242        public:
    43             Model(BaseObject* creator);
     43            Model(Context* context);
    4444            virtual ~Model();
    4545

  • code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc

    r9589 r9629  
    4545    CreateFactory(ParticleEmitter);
    4646
    47     ParticleEmitter::ParticleEmitter(BaseObject* creator) : StaticEntity(creator)
     47    ParticleEmitter::ParticleEmitter(Context* context) : StaticEntity(context)
    4848    {
    4949        RegisterObject(ParticleEmitter);

  • code/branches/core6/src/orxonox/graphics/ParticleEmitter.h

    r7904 r9629  
    4040    {
    4141        public:
    42             ParticleEmitter(BaseObject* creator);
     42            ParticleEmitter(Context* context);
    4343            virtual ~ParticleEmitter();
    4444

  • code/branches/core6/src/orxonox/graphics/ParticleSpawner.cc

    r7284 r9629  
    3939    CreateFactory(ParticleSpawner);
    4040
    41     ParticleSpawner::ParticleSpawner(BaseObject* creator) : ParticleEmitter(creator)
     41    ParticleSpawner::ParticleSpawner(Context* context) : ParticleEmitter(context)
    4242    {
    4343        RegisterObject(ParticleSpawner);

  • code/branches/core6/src/orxonox/graphics/ParticleSpawner.h

    r5929 r9629  
    4040    {
    4141        public:
    42             ParticleSpawner(BaseObject* creator);
     42            ParticleSpawner(Context* context);
    4343            virtual ~ParticleSpawner();
    4444

  • code/branches/core6/src/orxonox/infos/Bot.cc

    r9558 r9629  
    4040    CreateFactory(Bot);
    4141
    42     Bot::Bot(BaseObject* creator) : PlayerInfo(creator)
     42    Bot::Bot(Context* context) : PlayerInfo(context)
    4343    {
    4444        RegisterObject(Bot);

  • code/branches/core6/src/orxonox/infos/Bot.h

    r5781 r9629  
    4040    {
    4141        public:
    42             Bot(BaseObject* creator);
     42            Bot(Context* context);
    4343            virtual ~Bot();
    4444

  • code/branches/core6/src/orxonox/infos/GametypeInfo.cc

    r9348 r9629  
    6565        Registers and initializes the object.
    6666    */
    67     GametypeInfo::GametypeInfo(BaseObject* creator) : Info(creator)
     67    GametypeInfo::GametypeInfo(Context* context) : Info(context)
    6868    {
    6969        RegisterObject(GametypeInfo);

  • code/branches/core6/src/orxonox/infos/GametypeInfo.h

    r9348 r9629  
    5858
    5959        public:
    60             GametypeInfo(BaseObject* creator);
     60            GametypeInfo(Context* context);
    6161            virtual ~GametypeInfo();
    6262

  • code/branches/core6/src/orxonox/infos/HumanPlayer.cc

    r9558 r9629  
    4343    CreateUnloadableFactory(HumanPlayer);
    4444
    45     HumanPlayer::HumanPlayer(BaseObject* creator) : PlayerInfo(creator)
     45    HumanPlayer::HumanPlayer(Context* context) : PlayerInfo(context)
    4646    {
    4747        RegisterObject(HumanPlayer);
    … …  
    183183        if (this->isLocalPlayer() && !this->humanHudTemplate_.empty() && GameMode::showsGraphics())
    184184        {
    185             this->humanHud_ = new OverlayGroup(this);
     185            this->humanHud_ = new OverlayGroup(this->getContext());
    186186            this->humanHud_->addTemplate(this->humanHudTemplate_);
    187187            this->humanHud_->setOwner(this);
    … …  
    199199        if (this->isLocalPlayer() && !this->gametypeHudTemplate_.empty())
    200200        {
    201             this->gametypeHud_ = new OverlayGroup(this);
     201            this->gametypeHud_ = new OverlayGroup(this->getContext());
    202202            this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
    203203            this->gametypeHud_->setOwner(this);

  • code/branches/core6/src/orxonox/infos/HumanPlayer.h

    r7163 r9629  
    4040    {
    4141        public:
    42             HumanPlayer(BaseObject* creator);
     42            HumanPlayer(Context* context);
    4343            virtual ~HumanPlayer();
    4444

  • code/branches/core6/src/orxonox/infos/Info.cc

    r5781 r9629  
    3232namespace orxonox
    3333{
    34     Info::Info(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     34    Info::Info(Context* context) : BaseObject(context), Synchronisable(context)
    3535    {
    3636        RegisterObject(Info);

  • code/branches/core6/src/orxonox/infos/Info.h

    r5781 r9629  
    4040    {
    4141        public:
    42             Info(BaseObject* creator);
     42            Info(Context* context);
    4343            virtual ~Info() {}
    4444    };

  • code/branches/core6/src/orxonox/infos/PlayerInfo.cc

    r9348 r9629  
    4040namespace orxonox
    4141{
    42     PlayerInfo::PlayerInfo(BaseObject* creator) : Info(creator)
     42    PlayerInfo::PlayerInfo(Context* context) : Info(context)
    4343    {
    4444        RegisterObject(PlayerInfo);
    … …  
    136136            this->controller_ = 0;
    137137        }
    138         this->controller_ = this->defaultController_.fabricate(this);
     138        this->controller_ = this->defaultController_.fabricate(this->getContext());
    139139        assert(this->controller_);
    140140        this->controller_->setPlayer(this);

  • code/branches/core6/src/orxonox/infos/PlayerInfo.h

    r9563 r9629  
    4141    { // tolua_export
    4242        public:
    43             PlayerInfo(BaseObject* creator);
     43            PlayerInfo(Context* context);
    4444            virtual ~PlayerInfo();
    4545

  • code/branches/core6/src/orxonox/items/Engine.cc

    r9558 r9629  
    4646        Constructor. Registers and initializes the object.
    4747    */
    48     Engine::Engine(BaseObject* creator) : Item(creator)
     48    Engine::Engine(Context* context) : Item(context)
    4949    {
    5050        RegisterObject(Engine);

  • code/branches/core6/src/orxonox/items/Engine.h

    r8727 r9629  
    5656    {
    5757        public:
    58             Engine(BaseObject* creator);
     58            Engine(Context* context);
    5959            virtual ~Engine();
    6060

  • code/branches/core6/src/orxonox/items/Item.cc

    r5781 r9629  
    3232namespace orxonox
    3333{
    34     Item::Item(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     34    Item::Item(Context* context) : BaseObject(context), Synchronisable(context)
    3535    {
    3636        RegisterObject(Item);

  • code/branches/core6/src/orxonox/items/Item.h

    r5781 r9629  
    4040    {
    4141        public:
    42             Item(BaseObject* creator);
     42            Item(Context* context);
    4343            virtual ~Item() {}
    4444    };

  • code/branches/core6/src/orxonox/items/MultiStateEngine.cc

    r8727 r9629  
    5151    CreateFactory(MultiStateEngine);
    5252
    53     MultiStateEngine::MultiStateEngine(BaseObject* creator) : Engine(creator)
     53    MultiStateEngine::MultiStateEngine(Context* context) : Engine(context)
    5454    {
    5555        RegisterObject(MultiStateEngine);
    … …  
    5757        if (GameMode::isMaster())
    5858        {
    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());
    6161            this->defEngineSndNormal_->setLooping(true);
    6262            this->defEngineSndBoost_->setLooping(true);

  • code/branches/core6/src/orxonox/items/MultiStateEngine.h

    r8727 r9629  
    4949            };
    5050
    51             MultiStateEngine(BaseObject* creator);
     51            MultiStateEngine(Context* context);
    5252            virtual ~MultiStateEngine();
    5353

  • code/branches/core6/src/orxonox/overlays/GUISheet.cc

    r7401 r9629  
    3838    CreateFactory(GUISheet);
    3939
    40     GUISheet::GUISheet(BaseObject* creator)
    41         : BaseObject(creator)
     40    GUISheet::GUISheet(Context* context)
     41        : BaseObject(context)
    4242        , bShowOnLoad_(false)
    4343        , bHidePrevious_(false)

  • code/branches/core6/src/orxonox/overlays/GUISheet.h

    r7401 r9629  
    4141    {
    4242    public:
    43         GUISheet(BaseObject* creator);
     43        GUISheet(Context* context);
    4444        ~GUISheet();
    4545

  • code/branches/core6/src/orxonox/overlays/OrxonoxOverlay.cc

    r8858 r9629  
    6363    SetConsoleCommand("OrxonoxOverlay", "rotateOverlay",    &OrxonoxOverlay::rotateOverlay);
    6464
    65     OrxonoxOverlay::OrxonoxOverlay(BaseObject* creator)
    66         : BaseObject(creator)
     65    OrxonoxOverlay::OrxonoxOverlay(Context* context)
     66        : BaseObject(context)
    6767    {
    6868        RegisterObject(OrxonoxOverlay);

  • code/branches/core6/src/orxonox/overlays/OrxonoxOverlay.h

    r9563 r9629  
    8787
    8888    public:
    89         OrxonoxOverlay(BaseObject* creator);
     89        OrxonoxOverlay(Context* context);
    9090        virtual ~OrxonoxOverlay();
    9191

  • code/branches/core6/src/orxonox/overlays/OverlayGroup.cc

    r8309 r9629  
    4848    SetConsoleCommand("OverlayGroup", "scrollGroup",      &OverlayGroup::scrollGroup);
    4949
    50     OverlayGroup::OverlayGroup(BaseObject* creator)
    51         : BaseObject(creator)
     50    OverlayGroup::OverlayGroup(Context* context)
     51        : BaseObject(context)
    5252    {
    5353        RegisterObject(OverlayGroup);

  • code/branches/core6/src/orxonox/overlays/OverlayGroup.h

    r8309 r9629  
    5454    {
    5555    public:
    56         OverlayGroup(BaseObject* creator);
     56        OverlayGroup(Context* context);
    5757        //! Empty destructor.
    5858        ~OverlayGroup();

  • code/branches/core6/src/orxonox/sound/WorldAmbientSound.cc

    r7854 r9629  
    3838    CreateFactory(WorldAmbientSound);
    3939
    40     WorldAmbientSound::WorldAmbientSound(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     40    WorldAmbientSound::WorldAmbientSound(Context* context) : BaseObject(context), Synchronisable(context)
    4141    {
    4242        RegisterObject(WorldAmbientSound);

  • code/branches/core6/src/orxonox/sound/WorldAmbientSound.h

    r7854 r9629  
    4444    {
    4545        public:
    46             WorldAmbientSound(BaseObject* creator);
     46            WorldAmbientSound(Context* context);
    4747            virtual ~WorldAmbientSound();
    4848

  • code/branches/core6/src/orxonox/sound/WorldSound.cc

    r8858 r9629  
    4343    CreateFactory(WorldSound);
    4444
    45     WorldSound::WorldSound(BaseObject* creator)
    46         : StaticEntity(creator)
     45    WorldSound::WorldSound(Context* context)
     46        : StaticEntity(context)
    4747    {
    4848        RegisterObject(WorldSound);

  • code/branches/core6/src/orxonox/sound/WorldSound.h

    r7854 r9629  
    4545    {
    4646    public:
    47         WorldSound(BaseObject* creator);
     47        WorldSound(Context* context);
    4848
    4949        void XMLPort(Element& xmlelement, XMLPort::Mode mode);

  • code/branches/core6/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc

    r5781 r9629  
    3737    CreateFactory(DefaultWeaponmodeLink);
    3838
    39     DefaultWeaponmodeLink::DefaultWeaponmodeLink(BaseObject* creator) : BaseObject(creator)
     39    DefaultWeaponmodeLink::DefaultWeaponmodeLink(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(DefaultWeaponmodeLink);

  • code/branches/core6/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h

    r5781 r9629  
    3939    {
    4040        public:
    41             DefaultWeaponmodeLink(BaseObject* creator);
     41            DefaultWeaponmodeLink(Context* context);
    4242            virtual ~DefaultWeaponmodeLink();
    4343

  • code/branches/core6/src/orxonox/weaponsystem/Munition.cc

    r8729 r9629  
    3737    CreateFactory(Munition);
    3838
    39     Munition::Munition(BaseObject* creator) : BaseObject(creator)
     39    Munition::Munition(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(Munition);

  • code/branches/core6/src/orxonox/weaponsystem/Munition.h

    r7851 r9629  
    5656
    5757        public:
    58             Munition(BaseObject* creator);
     58            Munition(Context* context);
    5959            virtual ~Munition();
    6060

  • code/branches/core6/src/orxonox/weaponsystem/Weapon.cc

    r5929 r9629  
    4141    CreateFactory(Weapon);
    4242
    43     Weapon::Weapon(BaseObject* creator) : StaticEntity(creator)
     43    Weapon::Weapon(Context* context) : StaticEntity(context)
    4444    {
    4545        RegisterObject(Weapon);

  • code/branches/core6/src/orxonox/weaponsystem/Weapon.h

    r5929 r9629  
    4242    {
    4343        public:
    44             Weapon(BaseObject* creator);
     44            Weapon(Context* context);
    4545            virtual ~Weapon();
    4646

  • code/branches/core6/src/orxonox/weaponsystem/WeaponMode.cc

    r8858 r9629  
    4545namespace orxonox
    4646{
    47     WeaponMode::WeaponMode(BaseObject* creator) : BaseObject(creator)
     47    WeaponMode::WeaponMode(Context* context) : BaseObject(context)
    4848    {
    4949        RegisterObject(WeaponMode);
    … …  
    7575        if( GameMode::isMaster() )
    7676        {
    77             this->defSndWpnFire_ = new WorldSound(this);
     77            this->defSndWpnFire_ = new WorldSound(this->getContext());
    7878            this->defSndWpnFire_->setLooping(false);
    7979            this->bSoundAttached_ = false;

  • code/branches/core6/src/orxonox/weaponsystem/WeaponMode.h

    r9563 r9629  
    4444    {
    4545        public:
    46             WeaponMode(BaseObject* creator);
     46            WeaponMode(Context* context);
    4747            virtual ~WeaponMode();
    4848

  • code/branches/core6/src/orxonox/weaponsystem/WeaponPack.cc

    r6417 r9629  
    4040    CreateFactory(WeaponPack);
    4141
    42     WeaponPack::WeaponPack(BaseObject* creator) : BaseObject(creator)
     42    WeaponPack::WeaponPack(Context* context) : BaseObject(context)
    4343    {
    4444        RegisterObject(WeaponPack);

  • code/branches/core6/src/orxonox/weaponsystem/WeaponPack.h

    r6417 r9629  
    4141    {
    4242        public:
    43             WeaponPack(BaseObject* creator);
     43            WeaponPack(Context* context);
    4444            virtual ~WeaponPack();
    4545

  • code/branches/core6/src/orxonox/weaponsystem/WeaponSet.cc

    r5781 r9629  
    3939    CreateFactory(WeaponSet);
    4040
    41     WeaponSet::WeaponSet(BaseObject* creator) : BaseObject(creator)
     41    WeaponSet::WeaponSet(Context* context) : BaseObject(context)
    4242    {
    4343        RegisterObject(WeaponSet);

  • code/branches/core6/src/orxonox/weaponsystem/WeaponSet.h

    r5781 r9629  
    4141    {
    4242        public:
    43             WeaponSet(BaseObject* creator);
     43            WeaponSet(Context* context);
    4444            virtual ~WeaponSet();
    4545

  • code/branches/core6/src/orxonox/weaponsystem/WeaponSlot.cc

    r8706 r9629  
    3939    CreateFactory(WeaponSlot);
    4040
    41     WeaponSlot::WeaponSlot(BaseObject* creator) : StaticEntity(creator)
     41    WeaponSlot::WeaponSlot(Context* context) : StaticEntity(context)
    4242    {
    4343        RegisterObject(WeaponSlot);

  • code/branches/core6/src/orxonox/weaponsystem/WeaponSlot.h

    r8891 r9629  
    5757    {
    5858        public:
    59             WeaponSlot(BaseObject* creator);
     59            WeaponSlot(Context* context);
    6060            virtual ~WeaponSlot();
    6161

  • code/branches/core6/src/orxonox/weaponsystem/WeaponSystem.cc

    r9563 r9629  
    4848    CreateFactory(WeaponSystem);
    4949
    50     WeaponSystem::WeaponSystem(BaseObject* creator) : BaseObject(creator)
     50    WeaponSystem::WeaponSystem(Context* context) : BaseObject(context)
    5151    {
    5252        RegisterObject(WeaponSystem);
    … …  
    308308        else if (identifier->getIdentifier()->isA(Class(Munition)))
    309309        {
    310             Munition* munition = identifier->fabricate(this);
     310            Munition* munition = identifier->fabricate(this->getContext());
    311311            this->munitions_[identifier->getIdentifier()] = munition;
    312312            return munition;

  • code/branches/core6/src/orxonox/weaponsystem/WeaponSystem.h

    r6417 r9629  
    4343    {
    4444        public:
    45             WeaponSystem(BaseObject* creator);
     45            WeaponSystem(Context* context);
    4646            virtual ~WeaponSystem();
    4747

  • code/branches/core6/src/orxonox/worldentities/BigExplosion.cc

    r9589 r9629  
    4343    CreateFactory(BigExplosion);
    4444
    45     BigExplosion::BigExplosion(BaseObject* creator) : StaticEntity(creator)
     45    BigExplosion::BigExplosion(Context* context) : StaticEntity(context)
    4646    {
    4747        RegisterObject(BigExplosion);
    … …  
    8080    void BigExplosion::init()
    8181    {
    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());
    8686
    8787        this->debrisEntity1_->setSyncMode(0);
    … …  
    9090        this->debrisEntity4_->setSyncMode(0);
    9191
    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());
    9696
    9797        this->debris1_->setSyncMode(0);
    … …  
    100100        this->debris4_->setSyncMode(0);
    101101
    102         this->explosion_ = new StaticEntity(this);
     102        this->explosion_ = new StaticEntity(this->getContext());
    103103        this->explosion_->setSyncMode(0);
    104104
    … …  
    148148        this->debrisEntity4_->attach(debris4_);
    149149
    150         ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
     150        ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    151151        effect->setDestroyAfterLife(true);
    152152        effect->setSource("Orxonox/explosion2b");
    … …  
    154154        effect->setSyncMode(0);
    155155
    156         ParticleSpawner* effect2 = new ParticleSpawner(this->getCreator());
     156        ParticleSpawner* effect2 = new ParticleSpawner(this->getContext());
    157157        effect2->setDestroyAfterLife(true);
    158158        effect2->setSource("Orxonox/smoke6");
    … …  
    172172        for(int i=0;i<10;i++)
    173173        {
    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());
    179179
    180180            part1->setSyncMode(0);

  • code/branches/core6/src/orxonox/worldentities/BigExplosion.h

    r7176 r9629  
    4040    {
    4141        public:
    42             BigExplosion(BaseObject* creator);
     42            BigExplosion(Context* context);
    4343            virtual ~BigExplosion();
    4444

  • code/branches/core6/src/orxonox/worldentities/CameraPosition.cc

    r8706 r9629  
    3737    CreateFactory(CameraPosition);
    3838
    39     CameraPosition::CameraPosition(BaseObject* creator) : StaticEntity(creator)
     39    CameraPosition::CameraPosition(Context* context) : StaticEntity(context)
    4040    {
    4141        RegisterObject(CameraPosition);

  • code/branches/core6/src/orxonox/worldentities/CameraPosition.h

    r5781 r9629  
    3838    {
    3939        public:
    40             CameraPosition(BaseObject* creator);
     40            CameraPosition(Context* context);
    4141            virtual ~CameraPosition();
    4242

  • code/branches/core6/src/orxonox/worldentities/ControllableEntity.cc

    r9558 r9629  
    5252    registerMemberNetworkFunction( ControllableEntity, setTargetInternal );
    5353
    54     ControllableEntity::ControllableEntity(BaseObject* creator) : MobileEntity(creator)
     54    ControllableEntity::ControllableEntity(Context* context) : MobileEntity(context)
    5555    {
    5656        RegisterObject(ControllableEntity);
    … …  
    397397        if (!this->camera_ && GameMode::showsGraphics())
    398398        {
    399             this->camera_ = new Camera(this);
     399            this->camera_ = new Camera(this->getContext());
    400400            this->camera_->requestFocus();
    401401            if (!this->cameraPositionTemplate_.empty())
    … …  
    423423            if (!this->hudtemplate_.empty())
    424424            {
    425                 this->hud_ = new OverlayGroup(this);
     425                this->hud_ = new OverlayGroup(this->getContext());
    426426                this->hud_->addTemplate(this->hudtemplate_);
    427427                this->hud_->setOwner(this);

  • code/branches/core6/src/orxonox/worldentities/ControllableEntity.h

    r9348 r9629  
    4444
    4545        public:
    46             ControllableEntity(BaseObject* creator);
     46            ControllableEntity(Context* context);
    4747            virtual ~ControllableEntity();
    4848

  • code/branches/core6/src/orxonox/worldentities/Drone.cc

    r7163 r9629  
    3939        Constructor. Registers the object and initializes some default values.
    4040    */
    41     Drone::Drone(BaseObject* creator) : Pawn(creator)
     41    Drone::Drone(Context* context) : Pawn(context)
    4242    {
    4343        RegisterObject(Drone);
    … …  
    5050        this->setCollisionType(WorldEntity::Dynamic);
    5151
    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.
    5353        myController_->setDrone(this);
    5454

  • code/branches/core6/src/orxonox/worldentities/Drone.h

    r7163 r9629  
    4747    {
    4848        public:
    49             Drone(BaseObject* creator);
     49            Drone(Context* context);
    5050            virtual ~Drone();
    5151

  • code/branches/core6/src/orxonox/worldentities/EffectContainer.cc

    r6417 r9629  
    4242    CreateFactory(EffectContainer);
    4343
    44     EffectContainer::EffectContainer(BaseObject* creator)
    45         : BaseObject(creator)
     44    EffectContainer::EffectContainer(Context* context)
     45        : BaseObject(context)
    4646        , lua_(NULL)
    4747    {

  • code/branches/core6/src/orxonox/worldentities/EffectContainer.h

    r6417 r9629  
    4040    {
    4141        public:
    42             EffectContainer(BaseObject* creator);
     42            EffectContainer(Context* context);
    4343            virtual ~EffectContainer();
    4444

  • code/branches/core6/src/orxonox/worldentities/ExplosionChunk.cc

    r9589 r9629  
    4040    CreateFactory(ExplosionChunk);
    4141
    42     ExplosionChunk::ExplosionChunk(BaseObject* creator) : MovableEntity(creator)
     42    ExplosionChunk::ExplosionChunk(Context* context) : MovableEntity(context)
    4343    {
    4444        RegisterObject(ExplosionChunk);

  • code/branches/core6/src/orxonox/worldentities/ExplosionChunk.h

    r7163 r9629  
    4040    {
    4141        public:
    42             ExplosionChunk(BaseObject* creator);
     42            ExplosionChunk(Context* context);
    4343            virtual ~ExplosionChunk();
    4444

  • code/branches/core6/src/orxonox/worldentities/MobileEntity.cc

    r8858 r9629  
    3939namespace orxonox
    4040{
    41     MobileEntity::MobileEntity(BaseObject* creator) : WorldEntity(creator)
     41    MobileEntity::MobileEntity(Context* context) : WorldEntity(context)
    4242    {
    4343        RegisterObject(MobileEntity);

  • code/branches/core6/src/orxonox/worldentities/MobileEntity.h

    r8727 r9629  
    4141    {
    4242        public:
    43             MobileEntity(BaseObject* creator);
     43            MobileEntity(Context* context);
    4444            virtual ~MobileEntity();
    4545

  • code/branches/core6/src/orxonox/worldentities/MovableEntity.cc

    r7284 r9629  
    4343    CreateFactory(MovableEntity);
    4444
    45     MovableEntity::MovableEntity(BaseObject* creator) : MobileEntity(creator)
     45    MovableEntity::MovableEntity(Context* context) : MobileEntity(context)
    4646    {
    4747        RegisterObject(MovableEntity);

  • code/branches/core6/src/orxonox/worldentities/MovableEntity.h

    r7163 r9629  
    4343    {
    4444        public:
    45             MovableEntity(BaseObject* creator);
     45            MovableEntity(Context* context);
    4646            virtual ~MovableEntity();
    4747

  • code/branches/core6/src/orxonox/worldentities/SpawnPoint.cc

    r8858 r9629  
    3939    CreateFactory(SpawnPoint);
    4040
    41     SpawnPoint::SpawnPoint(BaseObject* creator) : StaticEntity(creator)
     41    SpawnPoint::SpawnPoint(Context* context) : StaticEntity(context)
    4242    {
    4343        RegisterObject(SpawnPoint);
    … …  
    8181    Pawn* SpawnPoint::spawn()
    8282    {
    83         Pawn* entity = this->spawnclass_.fabricate(this);
     83        Pawn* entity = this->spawnclass_.fabricate(this->getContext());
    8484        if (entity)
    8585        {

  • code/branches/core6/src/orxonox/worldentities/SpawnPoint.h

    r9563 r9629  
    4141    {
    4242        public:
    43             SpawnPoint(BaseObject* creator);
     43            SpawnPoint(Context* context);
    4444            virtual ~SpawnPoint() {}
    4545

  • code/branches/core6/src/orxonox/worldentities/StaticEntity.cc

    r8858 r9629  
    3939    CreateFactory(StaticEntity);
    4040
    41     StaticEntity::StaticEntity(BaseObject* creator) : WorldEntity(creator)
     41    StaticEntity::StaticEntity(Context* context) : WorldEntity(context)
    4242    {
    4343        RegisterObject(StaticEntity);

  • code/branches/core6/src/orxonox/worldentities/StaticEntity.h

    r7163 r9629  
    3939    {
    4040        public:
    41             StaticEntity(BaseObject* creator);
     41            StaticEntity(Context* context);
    4242            virtual ~StaticEntity();
    4343

  • code/branches/core6/src/orxonox/worldentities/TeamSpawnPoint.cc

    r5781 r9629  
    3636    CreateFactory(TeamSpawnPoint);
    3737
    38     TeamSpawnPoint::TeamSpawnPoint(BaseObject* creator) : SpawnPoint(creator)
     38    TeamSpawnPoint::TeamSpawnPoint(Context* context) : SpawnPoint(context)
    3939    {
    4040        RegisterObject(TeamSpawnPoint);

  • code/branches/core6/src/orxonox/worldentities/TeamSpawnPoint.h

    r5781 r9629  
    4040    {
    4141        public:
    42             TeamSpawnPoint(BaseObject* creator);
     42            TeamSpawnPoint(Context* context);
    4343            virtual ~TeamSpawnPoint() {}
    4444

  • code/branches/core6/src/orxonox/worldentities/WorldEntity.cc

    r9612 r9629  
    6666        All the default values are being set here.
    6767    */
    68     WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     68    WorldEntity::WorldEntity(Context* context) : BaseObject(context), Synchronisable(context)
    6969    {
    7070        RegisterObject(WorldEntity);
    … …  
    9292        this->bPhysicsActiveSynchronised_    = false;
    9393        this->bPhysicsActiveBeforeAttaching_ = false;
    94         this->collisionShape_ = new WorldEntityCollisionShape(this);
     94        this->collisionShape_ = new WorldEntityCollisionShape(this->getContext());
    9595        this->collisionShape_->setWorldEntityOwner(this);
    9696        this->collisionType_             = None;

  • code/branches/core6/src/orxonox/worldentities/WorldEntity.h

    r7910 r9629  
    9090
    9191        public:
    92             WorldEntity(BaseObject* creator);
     92            WorldEntity(Context* context);
    9393            virtual ~WorldEntity();
    9494

  • code/branches/core6/src/orxonox/worldentities/pawns/Destroyer.cc

    r5929 r9629  
    3636    CreateFactory(Destroyer);
    3737
    38     Destroyer::Destroyer(BaseObject* creator) : SpaceShip(creator)
     38    Destroyer::Destroyer(Context* context) : SpaceShip(context)
    3939    {
    4040        RegisterObject(Destroyer);

  • code/branches/core6/src/orxonox/worldentities/pawns/Destroyer.h

    r5781 r9629  
    3939    {
    4040        public:
    41             Destroyer(BaseObject* creator);
     41            Destroyer(Context* context);
    4242            virtual ~Destroyer() {};
    4343

  • code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.cc

    r9558 r9629  
    5555    CreateFactory(FpsPlayer);
    5656
    57     FpsPlayer::FpsPlayer(BaseObject* creator) : Pawn(creator)
     57    FpsPlayer::FpsPlayer(Context* context) : Pawn(context)
    5858    {
    5959        RegisterObject(FpsPlayer);

  • code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.h

    r9016 r9629  
    4343    {
    4444        public:
    45             FpsPlayer(BaseObject* creator);
     45            FpsPlayer(Context* context);
    4646            virtual ~FpsPlayer();
    4747

  • code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc

    r9554 r9629  
    5151    CreateFactory(Pawn);
    5252
    53     Pawn::Pawn(BaseObject* creator)
    54         : ControllableEntity(creator)
    55         , RadarViewable(creator, static_cast<WorldEntity*>(this))
     53    Pawn::Pawn(Context* context)
     54        : ControllableEntity(context)
     55        , RadarViewable(this, static_cast<WorldEntity*>(this))
    5656    {
    5757        RegisterObject(Pawn);
    … …  
    8484        if (GameMode::isMaster())
    8585        {
    86             this->weaponSystem_ = new WeaponSystem(this);
     86            this->weaponSystem_ = new WeaponSystem(this->getContext());
    8787            this->weaponSystem_->setPawn(this);
    8888        }
    … …  
    297297        if (!this->spawnparticlesource_.empty())
    298298        {
    299             ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
     299            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    300300            effect->setPosition(this->getPosition());
    301301            effect->setOrientation(this->getOrientation());
    … …  
    334334        this->setDestroyWhenPlayerLeft(false);
    335335
    336         BigExplosion* chunk = new BigExplosion(this->getCreator());
     336        BigExplosion* chunk = new BigExplosion(this->getContext());
    337337        chunk->setPosition(this->getPosition());
    338338
    … …  
    342342        // play death effect
    343343        {
    344             ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
     344            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    345345            effect->setPosition(this->getPosition());
    346346            effect->setOrientation(this->getOrientation());
    … …  
    350350        }
    351351        {
    352             ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
     352            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    353353            effect->setPosition(this->getPosition());
    354354            effect->setOrientation(this->getOrientation());
    … …  
    358358        }
    359359        {
    360             ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
     360            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    361361            effect->setPosition(this->getPosition());
    362362            effect->setOrientation(this->getOrientation());
    … …  
    367367        for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
    368368        {
    369             ExplosionChunk* chunk = new ExplosionChunk(this->getCreator());
     369            ExplosionChunk* chunk = new ExplosionChunk(this->getContext());
    370370            chunk->setPosition(this->getPosition());
    371371        }

  • code/branches/core6/src/orxonox/worldentities/pawns/Pawn.h

    r9348 r9629  
    4545
    4646        public:
    47             Pawn(BaseObject* creator);
     47            Pawn(Context* context);
    4848            virtual ~Pawn();
    4949

  • code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc

    r9589 r9629  
    4848    CreateFactory(SpaceShip);
    4949
    50     SpaceShip::SpaceShip(BaseObject* creator) : Pawn(creator), boostBlur_(NULL)
     50    SpaceShip::SpaceShip(Context* context) : Pawn(context), boostBlur_(NULL)
    5151    {
    5252        RegisterObject(SpaceShip);

  • code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.h

    r8727 r9629  
    8888    {
    8989        public:
    90             SpaceShip(BaseObject* creator);
     90            SpaceShip(Context* context);
    9191            virtual ~SpaceShip();
    9292

  • code/branches/core6/src/orxonox/worldentities/pawns/Spectator.cc

    r9558 r9629  
    4747    CreateFactory(Spectator);
    4848
    49     Spectator::Spectator(BaseObject* creator) : ControllableEntity(creator)
     49    Spectator::Spectator(Context* context) : ControllableEntity(context)
    5050    {
    5151        RegisterObject(Spectator);

  • code/branches/core6/src/orxonox/worldentities/pawns/Spectator.h

    r7862 r9629  
    4040    {
    4141        public:
    42             Spectator(BaseObject* creator);
     42            Spectator(Context* context);
    4343            virtual ~Spectator();
    4444

  • code/branches/core6/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

    r5929 r9629  
    3939    CreateFactory(TeamBaseMatchBase);
    4040
    41     TeamBaseMatchBase::TeamBaseMatchBase(BaseObject* creator) : Pawn(creator)
     41    TeamBaseMatchBase::TeamBaseMatchBase(Context* context) : Pawn(context)
    4242    {
    4343        RegisterObject(TeamBaseMatchBase);

  • code/branches/core6/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h

    r5781 r9629  
    5050    {
    5151        public:
    52             TeamBaseMatchBase(BaseObject* creator);
     52            TeamBaseMatchBase(Context* context);
    5353
    5454            // if class closes, close everything

  • code/branches/core6/test/core/class/SubclassIdentifierTest.cc

    r9601 r9629  
    1212        {
    1313            public:
    14                 TestClass(BaseObject* creator = NULL) { RegisterRootObject(TestClass); }
     14                TestClass(Context* context = NULL) { RegisterRootObject(TestClass); }
    1515        };
    1616
    … …  
    1818        {
    1919            public:
    20                 TestSubclass(BaseObject* creator = NULL) { RegisterObject(TestSubclass); }
     20                TestSubclass(Context* context = NULL) { RegisterObject(TestSubclass); }
    2121        };
    2222

  • code/branches/core6/test/core/class/SuperTest.cc

    r9601 r9629  
    1313        {
    1414            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)
    1616                {
    1717                    RegisterRootObject(TestClass);
    … …  
    3737        {
    3838            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)
    4040                {
    4141                    RegisterObject(TestSubclass);

  • code/branches/core6/test/core/object/ContextTest.cc

    • Property svn:eol-style set to native
    r9610 r9629  
    1111        {
    1212            public:
    13                 SubclassContext() { RegisterRootObject(SubclassContext); }
     13                SubclassContext() : Context(NULL) { RegisterRootObject(SubclassContext); }
    1414        };
    1515    }
    … …  
    1717    TEST(ContextTest, CanCreateContext)
    1818    {
    19         Context context;
     19        Context context(NULL);
    2020    }
    2121
    … …  
    2727    TEST(ContextTest, ContextIsItsOwnContext)
    2828    {
    29         Context context;
     29        Context context(NULL);
    3030        EXPECT_EQ(&context, context.getContext());
    3131    }
Note: See TracChangeset for help on using the changeset viewer.