Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 25, 2013, 9:08:42 PM (11 years ago)
Author:
landauf
Message:

merged core6 back to trunk

Location:
code/trunk
Files:
37 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/modules/overlays/hud/AnnounceMessage.cc

    r5781 r9667  
    3434namespace orxonox
    3535{
    36     CreateFactory(AnnounceMessage);
     36    RegisterClass(AnnounceMessage);
    3737
    38     AnnounceMessage::AnnounceMessage(BaseObject* creator) : FadeoutText(creator)
     38    AnnounceMessage::AnnounceMessage(Context* context) : FadeoutText(context)
    3939    {
    4040        RegisterObject(AnnounceMessage);

  • code/trunk/src/modules/overlays/hud/AnnounceMessage.h

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

  • code/trunk/src/modules/overlays/hud/ChatOverlay.cc

    r8858 r9667  
    3535#include "util/DisplayStringConversions.h"
    3636#include "core/CoreIncludes.h"
    37 #include "core/ConfigValueIncludes.h"
     37#include "core/config/ConfigValueIncludes.h"
    3838#include "core/command/Executor.h"
    3939
    … …  
    4444namespace orxonox
    4545{
    46     CreateFactory(ChatOverlay);
     46    RegisterClass(ChatOverlay);
    4747
    48     ChatOverlay::ChatOverlay(BaseObject* creator)
    49         : OverlayText(creator)
     48    ChatOverlay::ChatOverlay(Context* context)
     49        : OverlayText(context)
    5050    {
    5151        RegisterObject(ChatOverlay);

  • code/trunk/src/modules/overlays/hud/ChatOverlay.h

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

  • code/trunk/src/modules/overlays/hud/DeathMessage.cc

    r5781 r9667  
    3434namespace orxonox
    3535{
    36     CreateFactory(DeathMessage);
     36    RegisterClass(DeathMessage);
    3737
    38     DeathMessage::DeathMessage(BaseObject* creator) : FadeoutText(creator)
     38    DeathMessage::DeathMessage(Context* context) : FadeoutText(context)
    3939    {
    4040        RegisterObject(DeathMessage);

  • code/trunk/src/modules/overlays/hud/DeathMessage.h

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

  • code/trunk/src/modules/overlays/hud/GametypeFadingMessage.cc

    r7163 r9667  
    3434namespace orxonox
    3535{
    36     CreateFactory(GametypeFadingMessage);
     36    RegisterClass(GametypeFadingMessage);
    3737
    38     GametypeFadingMessage::GametypeFadingMessage(BaseObject* creator) : FadeoutText(creator)
     38    GametypeFadingMessage::GametypeFadingMessage(Context* context) : FadeoutText(context)
    3939    {
    4040        RegisterObject(GametypeFadingMessage);

  • code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h

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

  • code/trunk/src/modules/overlays/hud/GametypeStaticMessage.cc

    r7163 r9667  
    3636namespace orxonox
    3737{
    38     CreateFactory(GametypeStaticMessage);
     38    RegisterClass(GametypeStaticMessage);
    3939
    4040
    41     GametypeStaticMessage::GametypeStaticMessage(BaseObject* creator) : OverlayText(creator)
     41    GametypeStaticMessage::GametypeStaticMessage(Context* context) : OverlayText(context)
    4242    {
    4343        RegisterObject(GametypeStaticMessage);

  • code/trunk/src/modules/overlays/hud/GametypeStaticMessage.h

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

  • code/trunk/src/modules/overlays/hud/HUDBar.cc

    r8706 r9667  
    4545namespace orxonox
    4646{
    47     CreateFactory(BarColour);
    48 
    49     BarColour::BarColour(BaseObject* creator)
    50         : BaseObject(creator)
     47    RegisterClass(BarColour);
     48
     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    RegisterClass(HUDBar);
     70
     71    HUDBar::HUDBar(Context* context)
     72        : OrxonoxOverlay(context), right2Left_(false), autoColour_(false)
    7173    {
    7274        RegisterObject(HUDBar);

  • code/trunk/src/modules/overlays/hud/HUDBar.h

    r8706 r9667  
    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/trunk/src/modules/overlays/hud/HUDBoostBar.cc

    r9348 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(HUDBoostBar);
     37    RegisterClass(HUDBoostBar);
    3838
    39     HUDBoostBar::HUDBoostBar(BaseObject* creator)
    40         : HUDBar(creator)
     39    HUDBoostBar::HUDBoostBar(Context* context)
     40        : HUDBar(context)
    4141    {
    4242        RegisterObject(HUDBoostBar);

  • code/trunk/src/modules/overlays/hud/HUDBoostBar.h

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

  • code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc

    r9348 r9667  
    2929#include "HUDEnemyHealthBar.h"
    3030
    31 #include "core/ConfigValueIncludes.h"
     31#include "core/config/ConfigValueIncludes.h"
    3232#include "worldentities/pawns/Pawn.h"
    3333
    3434namespace orxonox
    3535{
    36     CreateFactory(HUDEnemyHealthBar);
     36    RegisterClass(HUDEnemyHealthBar);
    3737
    38     HUDEnemyHealthBar::HUDEnemyHealthBar(BaseObject* creator) : HUDHealthBar(creator)
     38    HUDEnemyHealthBar::HUDEnemyHealthBar(Context* context) : HUDHealthBar(context)
    3939    {
    4040        RegisterObject(HUDEnemyHealthBar);

  • code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h

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

  • code/trunk/src/modules/overlays/hud/HUDHealthBar.cc

    r6054 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(HUDHealthBar);
     39    RegisterClass(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/trunk/src/modules/overlays/hud/HUDHealthBar.h

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

  • code/trunk/src/modules/overlays/hud/HUDNavigation.cc

    r9526 r9667  
    5151#include "worldentities/pawns/Pawn.h"
    5252#include "worldentities/WorldEntity.h"
    53 #include "core/ConfigValueIncludes.h"
     53#include "core/config/ConfigValueIncludes.h"
    5454#include "tools/TextureGenerator.h"
    5555// #include <boost/bind/bind_template.hpp>
    … …  
    6767        return a.second < b.second;
    6868    }
    69     CreateFactory ( HUDNavigation );
     69    RegisterClass ( HUDNavigation );
    7070
    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/trunk/src/modules/overlays/hud/HUDNavigation.h

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

  • code/trunk/src/modules/overlays/hud/HUDRadar.cc

    r9348 r9667  
    4444namespace orxonox
    4545{
    46     CreateFactory(HUDRadar);
    47 
    48     HUDRadar::HUDRadar(BaseObject* creator)
    49         : OrxonoxOverlay(creator)
     46    RegisterClass(HUDRadar);
     47
     48    HUDRadar::HUDRadar(Context* context)
     49        : OrxonoxOverlay(context)
    5050    {
    5151        RegisterObject(HUDRadar);

  • code/trunk/src/modules/overlays/hud/HUDRadar.h

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

  • code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc

    r8706 r9667  
    3636namespace orxonox
    3737{
    38     CreateFactory(HUDSpeedBar);
     38    RegisterClass(HUDSpeedBar);
    3939
    40     HUDSpeedBar::HUDSpeedBar(BaseObject* creator)
    41         : HUDBar(creator)
     40    HUDSpeedBar::HUDSpeedBar(Context* context)
     41        : HUDBar(context)
    4242    {
    4343        RegisterObject(HUDSpeedBar);

  • code/trunk/src/modules/overlays/hud/HUDSpeedBar.h

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

  • code/trunk/src/modules/overlays/hud/HUDTimer.cc

    r5781 r9667  
    3636namespace orxonox
    3737{
    38     CreateFactory(HUDTimer);
     38    RegisterClass(HUDTimer);
    3939
    40     HUDTimer::HUDTimer(BaseObject* creator) : OverlayText(creator)
     40    HUDTimer::HUDTimer(Context* context) : OverlayText(context)
    4141    {
    4242        RegisterObject(HUDTimer);

  • code/trunk/src/modules/overlays/hud/HUDTimer.h

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

  • code/trunk/src/modules/overlays/hud/KillMessage.cc

    r5781 r9667  
    3434namespace orxonox
    3535{
    36     CreateFactory(KillMessage);
     36    RegisterClass(KillMessage);
    3737
    38     KillMessage::KillMessage(BaseObject* creator) : FadeoutText(creator)
     38    KillMessage::KillMessage(Context* context) : FadeoutText(context)
    3939    {
    4040        RegisterObject(KillMessage);

  • code/trunk/src/modules/overlays/hud/KillMessage.h

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

  • code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc

    r7655 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(LastManStandingInfos);
     39    RegisterClass(LastManStandingInfos);
    4040
    41     LastManStandingInfos::LastManStandingInfos(BaseObject* creator) : OverlayText(creator)
     41    LastManStandingInfos::LastManStandingInfos(Context* context) : OverlayText(context)
    4242    {
    4343        RegisterObject(LastManStandingInfos);

  • code/trunk/src/modules/overlays/hud/LastManStandingInfos.h

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

  • code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc

    r8351 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(LastTeamStandingInfos);
     39    RegisterClass(LastTeamStandingInfos);
    4040
    41     LastTeamStandingInfos::LastTeamStandingInfos(BaseObject* creator) : OverlayText(creator)
     41    LastTeamStandingInfos::LastTeamStandingInfos(Context* context) : OverlayText(context)
    4242    {
    4343        RegisterObject(LastTeamStandingInfos);

  • code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h

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

  • code/trunk/src/modules/overlays/hud/PauseNotice.cc

    r8079 r9667  
    3434namespace orxonox
    3535{
    36     CreateFactory(PauseNotice);
     36    RegisterClass(PauseNotice);
    3737
    38     PauseNotice::PauseNotice(BaseObject* creator) : OverlayText(creator)
     38    PauseNotice::PauseNotice(Context* context) : OverlayText(context)
    3939    {
    4040        RegisterObject(PauseNotice);

  • code/trunk/src/modules/overlays/hud/PauseNotice.h

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

  • code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc

    r6417 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(TeamBaseMatchScore);
     39    RegisterClass(TeamBaseMatchScore);
    4040
    41     TeamBaseMatchScore::TeamBaseMatchScore(BaseObject* creator) : OverlayText(creator)
     41    TeamBaseMatchScore::TeamBaseMatchScore(Context* context) : OverlayText(context)
    4242    {
    4343        RegisterObject(TeamBaseMatchScore);

  • code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.h

    r5781 r9667  
    4040    {
    4141        public:
    42             TeamBaseMatchScore(BaseObject* creator);
     42            TeamBaseMatchScore(Context* context);
    4343            virtual ~TeamBaseMatchScore();
    4444
Note: See TracChangeset for help on using the changeset viewer.