Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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/src/orxonox/gametypes
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.