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:
285 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/modules/designtools/CreateStars.cc

    r8351 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(CreateStars);
     39    RegisterClass(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/trunk/src/modules/designtools/CreateStars.h

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

  • code/trunk/src/modules/designtools/ScreenshotManager.cc

    r8858 r9667  
    4242#include <OgreViewport.h>
    4343
    44 #include "core/ConfigValueIncludes.h"
     44#include "core/CoreIncludes.h"
     45#include "core/config/ConfigValueIncludes.h"
    4546#include "core/GraphicsManager.h"
    4647#include "core/PathConfig.h"
    … …  
    6869    ScreenshotManager::ScreenshotManager() : finalPicturePB_(NULL), data_(NULL)
    6970    {
    70         RegisterRootObject(ScreenshotManager);
     71        RegisterObject(ScreenshotManager);
    7172       
    7273        this->setConfigValues();

  • code/trunk/src/modules/designtools/ScreenshotManager.h

    r8413 r9667  
    4444
    4545#include "util/Singleton.h"
    46 #include "core/OrxonoxClass.h"
     46#include "core/config/Configurable.h"
    4747
    4848namespace orxonox
    … …  
    6161    @ingroup Designtools
    6262    */
    63     class ScreenshotManager : public OrxonoxClass, public Singleton<ScreenshotManager>
     63    class ScreenshotManager : public Configurable, public Singleton<ScreenshotManager>
    6464    {
    6565        friend class Singleton<ScreenshotManager>;

  • code/trunk/src/modules/designtools/SkyboxGenerator.cc

    r8858 r9667  
    4040#include "util/ScopedSingletonManager.h"
    4141#include "core/CoreIncludes.h"
    42 #include "core/ConfigValueIncludes.h"
     42#include "core/config/ConfigValueIncludes.h"
    4343#include "core/GraphicsManager.h"
    4444#include "core/PathConfig.h"
    … …  
    6868    SkyboxGenerator::SkyboxGenerator()
    6969    {
    70         RegisterRootObject(SkyboxGenerator);
     70        RegisterObject(SkyboxGenerator);
    7171
    7272        this->setConfigValues();

  • code/trunk/src/modules/designtools/SkyboxGenerator.h

    r8232 r9667  
    3636#define __SkyboxGenerator_h__
    3737
    38 #include "core/OrxonoxClass.h"
     38#include "core/config/Configurable.h"
    3939#include "util/Singleton.h"
    4040#include "tools/interfaces/Tickable.h"
    … …  
    5858    @ingroup Designtools
    5959    */
    60     class SkyboxGenerator : public virtual OrxonoxClass, public Singleton<SkyboxGenerator>, public Tickable
     60    class SkyboxGenerator : public virtual Configurable, public Singleton<SkyboxGenerator>, public Tickable
    6161    {
    6262        friend class Singleton<SkyboxGenerator>;

  • code/trunk/src/modules/docking/Dock.cc

    r8858 r9667  
    4646namespace orxonox
    4747{
    48     CreateFactory(Dock);
     48    RegisterClass(Dock);
    4949
    5050    SetConsoleCommand("Dock", "dock",    &Dock::cmdDock).addShortcut().setAsInputCommand();
    … …  
    5353    registerStaticNetworkFunction(Dock::showDockingDialog);
    5454
    55     Dock::Dock(BaseObject* creator) : StaticEntity(creator)
     55    Dock::Dock(Context* context) : StaticEntity(context)
    5656    {
    5757        RegisterObject(Dock);

  • code/trunk/src/modules/docking/Dock.h

    r8706 r9667  
    4040#include <set>
    4141
    42 #include "core/CoreIncludes.h"
    4342#include "core/EventIncludes.h"
    4443#include "core/XMLPort.h"
    … …  
    5857    { // tolua_export
    5958        public:
    60             Dock(BaseObject* creator);
     59            Dock(Context* context);
    6160            virtual ~Dock();
    6261

  • code/trunk/src/modules/docking/DockToShip.cc

    r8858 r9667  
    3838namespace orxonox
    3939{
    40     CreateFactory(DockToShip);
     40    RegisterClass(DockToShip);
    4141
    42     DockToShip::DockToShip(BaseObject* creator) : DockingEffect(creator)
     42    DockToShip::DockToShip(Context* context) : DockingEffect(context)
    4343    {
    4444        RegisterObject(DockToShip);

  • code/trunk/src/modules/docking/DockToShip.h

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

  • code/trunk/src/modules/docking/DockingAnimation.cc

    r8706 r9667  
    3535
    3636#include "DockingEffect.h"  // For DockingEffect::findTarget
     37#include "core/CoreIncludes.h"
    3738
    3839namespace orxonox
    3940{
    40     DockingAnimation::DockingAnimation(BaseObject* creator) : BaseObject(creator)
     41    RegisterAbstractClass(DockingAnimation).inheritsFrom(Class(BaseObject));
     42
     43    DockingAnimation::DockingAnimation(Context* context) : BaseObject(context)
    4144    {
    4245        RegisterObject(DockingAnimation);

  • code/trunk/src/modules/docking/DockingAnimation.h

    r8706 r9667  
    3636#define _DockingAnimation_H__
    3737
    38 #include "core/CoreIncludes.h"
    3938#include "core/XMLPort.h"
    4039
    … …  
    6463    {
    6564        public:
    66             DockingAnimation(BaseObject* creator);
     65            DockingAnimation(Context* context);
    6766            virtual ~DockingAnimation();
    6867

  • code/trunk/src/modules/docking/DockingController.cc

    r9348 r9667  
    3434#include "worldentities/ControllableEntity.h"
    3535#include "Dock.h"
     36#include "core/CoreIncludes.h"
    3637
    3738namespace orxonox
    3839{
    39     CreateFactory(DockingController);
     40    RegisterClass(DockingController);
    4041
    41     DockingController::DockingController(BaseObject* creator) : ArtificialController(creator)
     42    DockingController::DockingController(Context* context) : ArtificialController(context)
    4243    {
    4344        RegisterObject(DockingController);

  • code/trunk/src/modules/docking/DockingController.h

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

  • code/trunk/src/modules/docking/DockingEffect.cc

    r8706 r9667  
    3333
    3434#include "DockingEffect.h"
     35#include "core/CoreIncludes.h"
    3536
    3637namespace orxonox
    3738{
    38     DockingEffect::DockingEffect(BaseObject* creator) : BaseObject(creator)
     39    RegisterAbstractClass(DockingEffect).inheritsFrom(Class(BaseObject));
     40
     41    DockingEffect::DockingEffect(Context* context) : BaseObject(context)
    3942    {
    4043        RegisterObject(DockingEffect);

  • code/trunk/src/modules/docking/DockingEffect.h

    r8706 r9667  
    3636#define _DockingEffect_H__
    3737
    38 #include "core/CoreIncludes.h"
    3938#include "core/XMLPort.h"
    4039
    … …  
    6261    {
    6362        public:
    64             DockingEffect(BaseObject* creator);
     63            DockingEffect(Context* context);
    6564            virtual ~DockingEffect();
    6665

  • code/trunk/src/modules/docking/DockingPrecompiledHeaders.h

    r8706 r9667  
    4545
    4646#include "core/BaseObject.h"
    47 #include "core/CoreIncludes.h"
    4847#include "core/XMLPort.h"
    4948

  • code/trunk/src/modules/docking/DockingTarget.cc

    r8858 r9667  
    3333
    3434#include "DockingTarget.h"
     35#include "core/CoreIncludes.h"
    3536#include "core/XMLPort.h"
    3637
    … …  
    3839namespace orxonox
    3940{
    40     CreateFactory(DockingTarget);
     41    RegisterClass(DockingTarget);
    4142
    42     DockingTarget::DockingTarget(BaseObject* creator) : StaticEntity(creator)
     43    DockingTarget::DockingTarget(Context* context) : StaticEntity(context)
    4344    {
    4445        RegisterObject(DockingTarget);

  • code/trunk/src/modules/docking/DockingTarget.h

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

  • code/trunk/src/modules/docking/MoveToDockingTarget.cc

    r8706 r9667  
    3636
    3737#include "core/XMLPort.h"
     38#include "core/CoreIncludes.h"
    3839
    3940namespace orxonox
    4041{
    41     CreateFactory(MoveToDockingTarget);
     42    RegisterClass(MoveToDockingTarget);
    4243
    43     MoveToDockingTarget::MoveToDockingTarget(BaseObject *creator) : DockingAnimation(creator)
     44    MoveToDockingTarget::MoveToDockingTarget(Context* context) : DockingAnimation(context)
    4445    {
    4546        RegisterObject(MoveToDockingTarget);
    … …  
    5455        assert(this->parent_);
    5556
    56         DockingController *dockingController = new DockingController(this);
     57        DockingController *dockingController = new DockingController(this->getContext());
    5758        dockingController->setDock(this->parent_);
    5859        dockingController->setPlayer(player);

  • code/trunk/src/modules/docking/MoveToDockingTarget.h

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

  • code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc

    r9348 r9667  
    3838namespace orxonox
    3939{
    40     CreateFactory(OldRaceCheckPoint);
     40    RegisterClass(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/trunk/src/modules/gametypes/OldRaceCheckPoint.h

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

  • code/trunk/src/modules/gametypes/OldSpaceRace.cc

    r9348 r9667  
    3636namespace orxonox
    3737{
    38     CreateUnloadableFactory(OldSpaceRace);
     38    RegisterUnloadableClass(OldSpaceRace);
    3939
    40     OldSpaceRace::OldSpaceRace(BaseObject* creator) : Gametype(creator)
     40    OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context)
    4141    {
    4242        RegisterObject(OldSpaceRace);

  • code/trunk/src/modules/gametypes/OldSpaceRace.h

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

  • code/trunk/src/modules/gametypes/RaceCheckPoint.cc

    r9526 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(RaceCheckPoint);
    44 
    45     RaceCheckPoint::RaceCheckPoint(BaseObject* creator) : DistanceMultiTrigger(creator),
    46             RadarViewable(creator, static_cast<WorldEntity*> (this))
     43    RegisterClass(RaceCheckPoint);
     44
     45    RaceCheckPoint::RaceCheckPoint(Context* context) : DistanceMultiTrigger(context),
     46            RadarViewable(this, static_cast<WorldEntity*> (this))
    4747    {
    4848        RegisterObject(RaceCheckPoint);
    … …  
    157157        if (players_.size() > 0)
    158158        {
    159             for (int i = 0; i < players_.size(); i++)
     159            for (size_t i = 0; i < players_.size(); i++)
    160160            {
    161161                if (this->players_[i]->getClientID() == clientID)
    … …  
    172172        if (players_.size() > 0)
    173173        {
    174             for (int i = 0; i < players_.size(); i++)
     174            for (size_t i = 0; i < players_.size(); i++)
    175175            {
    176176                if (this->players_[i] == player)

  • code/trunk/src/modules/gametypes/RaceCheckPoint.h

    r9526 r9667  
    4545    {
    4646        public:
    47             RaceCheckPoint(BaseObject* creator);
     47            RaceCheckPoint(Context* context);
    4848            virtual ~RaceCheckPoint();
    4949
    … …  
    7070            }
    7171
    72             const std::set<int>& getNextCheckpoints()
     72            std::set<int> getNextCheckpoints()
    7373            {
    7474                return nextCheckpoints_;

  • code/trunk/src/modules/gametypes/SpaceRace.cc

    r9526 r9667  
    4040namespace orxonox
    4141{
    42     CreateUnloadableFactory(SpaceRace);
     42    RegisterUnloadableClass(SpaceRace);
    4343
    44     SpaceRace::SpaceRace(BaseObject* creator) : Gametype(creator)
     44    SpaceRace::SpaceRace(Context* context) : Gametype(context)
    4545    {
    4646        RegisterObject(SpaceRace);

  • code/trunk/src/modules/gametypes/SpaceRace.h

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

  • code/trunk/src/modules/gametypes/SpaceRaceBot.cc

    r9526 r9667  
    2929namespace orxonox
    3030{
    31     CreateFactory(SpaceRaceBot);
     31    RegisterClass(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/trunk/src/modules/gametypes/SpaceRaceBot.h

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

  • code/trunk/src/modules/gametypes/SpaceRaceController.cc

    r9526 r9667  
    4545namespace orxonox
    4646{
    47     CreateFactory(SpaceRaceController);
     47    RegisterClass(SpaceRaceController);
    4848
    4949    const int ADJUSTDISTANCE = 500;
    … …  
    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)
    … …  
    8686
    8787        }//ausgabe*/
    88 
     88        /*
    8989        for (std::vector<RaceCheckPoint*>::iterator it = checkpoints.begin(); it != checkpoints.end(); ++it)
    9090        {
    … …  
    100100                }
    101101            }
    102         }/*
     102        }
     103        */
     104        /*
    103105        for(std::vector<RaceCheckPoint*>::iterator it=checkpoints_.begin(); it!=checkpoints_.end(); it++)
    104106        {
    … …  
    301303    {
    302304        for (size_t i = 0; i < this->checkpoints_.size(); ++i)
    303         if (this->checkpoints_[i]->getCheckpointIndex() == index)
    304         return this->checkpoints_[i];
     305            if (this->checkpoints_[i]->getCheckpointIndex() == index)
     306                return this->checkpoints_[i];
    305307        return NULL;
    306308    }
    … …  
    340342        //orxout()<<"temp nach ausgabe: "<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().x<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().y<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().z<<endl;
    341343        //OrxAssert(virtualCheckPointIndex < -1, "TO much virtual cp");
    342         /*orxout()<<"id: "<< previousCheckpoint->getCheckpointIndex() <<", following:"<<indexFollowingCheckPoint<<" :       "<<temp.x<<", "<<temp.y<<", "<<temp.z<<";       ";
     344        orxout()<<"id: "<< previousCheckpoint->getCheckpointIndex() <<", following:"<<indexFollowingCheckPoint<<" :       "<<temp.x<<", "<<temp.y<<", "<<temp.z<<";       ";
    343345         temp=previousCheckpoint->getNextCheckpointsAsVector3();
    344346         orxout()<<"id: "<< previousCheckpoint->getCheckpointIndex() <<":       "<<temp.x<<", "<<temp.y<<", "<<temp.z<<";       ";
    345          orxout()<<endl;*//*
     347         orxout()<<endl;
    346348        return newTempRaceCheckPoint;
    347349    }*/

  • code/trunk/src/modules/gametypes/SpaceRaceController.h

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

  • code/trunk/src/modules/gametypes/SpaceRaceManager.cc

    r9526 r9667  
    4040namespace orxonox
    4141{
    42     CreateFactory(SpaceRaceManager);
     42    RegisterClass(SpaceRaceManager);
    4343
    44     SpaceRaceManager::SpaceRaceManager(BaseObject* creator) :
    45         BaseObject(creator)
     44    SpaceRaceManager::SpaceRaceManager(Context* context) :
     45        BaseObject(context)
    4646    {
    4747        RegisterObject(SpaceRaceManager);

  • code/trunk/src/modules/gametypes/SpaceRaceManager.h

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

  • code/trunk/src/modules/notifications/NotificationDispatcher.cc

    r8891 r9667  
    4848{
    4949
    50     CreateUnloadableFactory(NotificationDispatcher);
     50    RegisterUnloadableClass(NotificationDispatcher);
    5151
    5252    registerMemberNetworkFunction(NotificationDispatcher, broadcastHelper);
    … …  
    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/trunk/src/modules/notifications/NotificationDispatcher.h

    r8891 r9667  
    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/trunk/src/modules/notifications/NotificationManager.cc

    r8858 r9667  
    5555    NotificationManager::NotificationManager()
    5656    {
    57         RegisterRootObject(NotificationManager);
     57        RegisterObject(NotificationManager);
    5858
    5959        orxout(internal_info, context::notifications) << "NotificatioManager created." << endl;

  • code/trunk/src/modules/notifications/NotificationManager.h

    r8706 r9667  
    4242#include <string>
    4343
    44 #include "core/OrxonoxClass.h"
    4544#include "util/Singleton.h"
    4645#include "interfaces/NotificationListener.h"

  • code/trunk/src/modules/notifications/NotificationQueue.cc

    r9253 r9667  
    4444{
    4545
    46     CreateFactory(NotificationQueue);
     46    RegisterClass(NotificationQueue);
    4747
    4848    /**
    … …  
    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/trunk/src/modules/notifications/NotificationQueue.h

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

  • code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc

    r8858 r9667  
    4646{
    4747
    48     CreateFactory(NotificationQueueCEGUI);
     48    RegisterClass(NotificationQueueCEGUI);
    4949
    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/trunk/src/modules/notifications/NotificationQueueCEGUI.h

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

  • code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc

    r9550 r9667  
    4444namespace orxonox {
    4545
    46     CreateFactory(CommandNotification);
     46    RegisterClass(CommandNotification);
    4747
    4848    /**
    … …  
    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/trunk/src/modules/notifications/dispatchers/CommandNotification.h

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

  • code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc

    r8706 r9667  
    3939namespace orxonox {
    4040
    41     CreateFactory(SimpleNotification);
     41    RegisterClass(SimpleNotification);
    4242
    4343    /**
    … …  
    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/trunk/src/modules/notifications/dispatchers/SimpleNotification.h

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

  • code/trunk/src/modules/objects/Attacher.cc

    r6417 r9667  
    3434namespace orxonox
    3535{
    36     CreateFactory(Attacher);
     36    RegisterClass(Attacher);
    3737
    38     Attacher::Attacher(BaseObject* creator) : StaticEntity(creator)
     38    Attacher::Attacher(Context* context) : StaticEntity(context)
    3939    {
    4040        RegisterObject(Attacher);

  • code/trunk/src/modules/objects/Attacher.h

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

  • code/trunk/src/modules/objects/ForceField.cc

    r8858 r9667  
    4040namespace orxonox
    4141{
    42     CreateFactory(ForceField);
     42    RegisterClass(ForceField);
    4343
    4444    /*static*/ const std::string ForceField::modeTube_s = "tube";
    … …  
    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/trunk/src/modules/objects/ForceField.h

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

  • code/trunk/src/modules/objects/Planet.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(Planet);
     44    RegisterClass(Planet);
    4545
    4646    /**
    4747     * @brief Constructor
    4848     */
    49     Planet::Planet(BaseObject* creator) : MovableEntity(creator)
     49    Planet::Planet(Context* context) : MovableEntity(context)
    5050    {
    5151        RegisterObject(Planet);

  • code/trunk/src/modules/objects/Planet.h

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

  • code/trunk/src/modules/objects/Script.cc

    r8858 r9667  
    4646namespace orxonox
    4747{
    48     CreateFactory(Script);
     48    RegisterClass(Script);
    4949
    5050    registerStaticNetworkFunction(Script::executeHelper);
    … …  
    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/trunk/src/modules/objects/Script.h

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

  • code/trunk/src/modules/objects/SpaceBoundaries.cc

    r8858 r9667  
    3232
    3333#include "core/CoreIncludes.h"
    34 #include "core/ObjectListIterator.h"
     34#include "core/object/ObjectListIterator.h"
    3535#include "core/XMLPort.h"
    3636
    … …  
    4242namespace orxonox
    4343{
    44     CreateFactory(SpaceBoundaries);
    45 
    46     SpaceBoundaries::SpaceBoundaries(BaseObject* creator) : StaticEntity(creator)
     44    RegisterClass(SpaceBoundaries);
     45
     46    SpaceBoundaries::SpaceBoundaries(Context* context) : StaticEntity(context)
    4747    {
    4848        RegisterObject(SpaceBoundaries);
    … …  
    7373    {
    7474        pawnsIn_.clear();
    75         for(ObjectListIterator<Pawn> current = ObjectList<Pawn>::begin(); current != ObjectList<Pawn>::end(); ++current)
     75        for(ObjectList<Pawn>::iterator current = ObjectList<Pawn>::begin(); current != ObjectList<Pawn>::end(); ++current)
    7676        {
    7777            Pawn* currentPawn = *current;
    … …  
    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/trunk/src/modules/objects/SpaceBoundaries.h

    r8767 r9667  
    3636#include <vector>
    3737
    38 #include "core/CoreIncludes.h"
    39 #include "core/WeakPtr.h"
     38#include "core/object/WeakPtr.h"
    4039
    4140#include "tools/interfaces/Tickable.h"
    … …  
    7675    {
    7776        public:
    78             SpaceBoundaries(BaseObject* creator);
     77            SpaceBoundaries(Context* context);
    7978            ~SpaceBoundaries();
    8079

  • code/trunk/src/modules/objects/Turret.cc

    r9526 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(Turret);
     37    RegisterClass(Turret);
    3838
    3939    /**
    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/trunk/src/modules/objects/Turret.h

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

  • code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(BoxCollisionShape);
     44    RegisterClass(BoxCollisionShape);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h

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

  • code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(ConeCollisionShape);
     44    RegisterClass(ConeCollisionShape);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h

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

  • code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(PlaneCollisionShape);
     44    RegisterClass(PlaneCollisionShape);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h

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

  • code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(SphereCollisionShape);
     44    RegisterClass(SphereCollisionShape);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h

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

  • code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc

    r5929 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(EventDispatcher);
     37    RegisterClass(EventDispatcher);
    3838
    39     EventDispatcher::EventDispatcher(BaseObject* creator) : BaseObject(creator)
     39    EventDispatcher::EventDispatcher(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(EventDispatcher);

  • code/trunk/src/modules/objects/eventsystem/EventDispatcher.h

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

  • code/trunk/src/modules/objects/eventsystem/EventFilter.cc

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

  • code/trunk/src/modules/objects/eventsystem/EventFilter.h

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

  • code/trunk/src/modules/objects/eventsystem/EventListener.cc

    r8858 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(EventListener);
     37    RegisterClass(EventListener);
    3838
    39     EventListener::EventListener(BaseObject* creator) : BaseObject(creator)
     39    EventListener::EventListener(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(EventListener);

  • code/trunk/src/modules/objects/eventsystem/EventListener.h

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

  • code/trunk/src/modules/objects/eventsystem/EventName.cc

    r5929 r9667  
    3232namespace orxonox
    3333{
    34     CreateFactory(EventName);
     34    RegisterClass(EventName);
    3535
    36     EventName::EventName(BaseObject* creator) : BaseObject(creator)
     36    EventName::EventName(Context* context) : BaseObject(context)
    3737    {
    3838        RegisterObject(EventName);

  • code/trunk/src/modules/objects/eventsystem/EventName.h

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

  • code/trunk/src/modules/objects/eventsystem/EventTarget.cc

    r8858 r9667  
    3333namespace orxonox
    3434{
    35     CreateFactory(EventTarget);
     35    RegisterClass(EventTarget);
    3636
    37     EventTarget::EventTarget(BaseObject* creator) : BaseObject(creator)
     37    EventTarget::EventTarget(Context* context) : BaseObject(context)
    3838    {
    3939        RegisterObject(EventTarget);

  • code/trunk/src/modules/objects/eventsystem/EventTarget.h

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

  • code/trunk/src/modules/objects/triggers/CheckPoint.cc

    r9348 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(CheckPoint);
     44    RegisterClass(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/trunk/src/modules/objects/triggers/CheckPoint.h

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

  • code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc

    r8858 r9667  
    4747    /*static*/ const std::string DistanceMultiTrigger::beaconModeExlcude_s = "exclude";
    4848   
    49     CreateFactory(DistanceMultiTrigger);
     49    RegisterClass(DistanceMultiTrigger);
    5050
    5151    /**
    … …  
    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/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h

    r9016 r9667  
    4040#include <map>
    4141
    42 #include "core/WeakPtr.h"
     42#include "core/object/WeakPtr.h"
    4343
    4444#include "worldentities/WorldEntity.h"
    … …  
    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/trunk/src/modules/objects/triggers/DistanceTrigger.cc

    r8858 r9667  
    4949    /*static*/ const std::string DistanceTrigger::beaconModeExlcude_s = "exclude";
    5050
    51     CreateFactory(DistanceTrigger);
     51    RegisterClass(DistanceTrigger);
    5252
    5353    /**
    … …  
    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/trunk/src/modules/objects/triggers/DistanceTrigger.h

    r8706 r9667  
    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/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc

    r7601 r9667  
    4040{
    4141
    42     CreateFactory(DistanceTriggerBeacon);
     42    RegisterClass(DistanceTriggerBeacon);
    4343
    4444    /**
    … …  
    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/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h

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

  • code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc

    r7601 r9667  
    4343{
    4444
    45     CreateFactory(EventMultiTrigger);
     45    RegisterClass(EventMultiTrigger);
    4646
    4747    /**
    … …  
    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/trunk/src/modules/objects/triggers/EventMultiTrigger.h

    r8213 r9667  
    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/trunk/src/modules/objects/triggers/EventTrigger.cc

    r8213 r9667  
    4040namespace orxonox
    4141{
    42     CreateFactory(EventTrigger);
     42    RegisterClass(EventTrigger);
    4343
    4444    /**
    … …  
    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/trunk/src/modules/objects/triggers/EventTrigger.h

    r8706 r9667  
    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/trunk/src/modules/objects/triggers/MultiTrigger.cc

    r8858 r9667  
    4343{
    4444
    45     CreateFactory(MultiTrigger);
     45    RegisterClass(MultiTrigger);
    4646
    4747    /**
    … …  
    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/trunk/src/modules/objects/triggers/MultiTrigger.h

    r9016 r9667  
    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/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc

    r8706 r9667  
    4242{
    4343
    44     CreateUnloadableFactory(MultiTriggerContainer);
     44    RegisterUnloadableClass(MultiTriggerContainer);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/objects/triggers/MultiTriggerContainer.h

    r7601 r9667  
    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/trunk/src/modules/objects/triggers/Trigger.cc

    r8706 r9667  
    4747    SetConsoleCommand("Trigger", "debugFlares", &Trigger::debugFlares).defaultValues(false);
    4848
    49     CreateFactory(Trigger);
     49    RegisterClass(Trigger);
    5050
    5151    /**
    … …  
    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/trunk/src/modules/objects/triggers/Trigger.h

    r8213 r9667  
    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/trunk/src/modules/objects/triggers/TriggerBase.cc

    r8858 r9667  
    4646    /*static*/ const std::string TriggerBase::xor_s = "xor";
    4747
    48     CreateFactory(TriggerBase);
     48    RegisterClass(TriggerBase);
    4949
    5050    /**
    … …  
    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/trunk/src/modules/objects/triggers/TriggerBase.h

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

  • code/trunk/src/modules/overlays/FadeoutText.cc

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

  • code/trunk/src/modules/overlays/FadeoutText.h

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

  • code/trunk/src/modules/overlays/GUIOverlay.cc

    r8858 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(GUIOverlay);
     43    RegisterClass(GUIOverlay);
    4444
    45     GUIOverlay::GUIOverlay(BaseObject* creator) : OrxonoxOverlay(creator)
     45    GUIOverlay::GUIOverlay(Context* context) : OrxonoxOverlay(context)
    4646    {
    4747        RegisterObject(GUIOverlay);

  • code/trunk/src/modules/overlays/GUIOverlay.h

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

  • code/trunk/src/modules/overlays/OverlayText.cc

    r7401 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(OverlayText);
     43    RegisterClass(OverlayText);
    4444
    4545    BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Left   == (int)OverlayText::Left);
    … …  
    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/trunk/src/modules/overlays/OverlayText.h

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

  • code/trunk/src/modules/overlays/debugging/DebugFPSText.cc

    r5781 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(DebugFPSText);
     37    RegisterClass(DebugFPSText);
    3838
    39     DebugFPSText::DebugFPSText(BaseObject* creator) : OverlayText(creator)
     39    DebugFPSText::DebugFPSText(Context* context) : OverlayText(context)
    4040    {
    4141        RegisterObject(DebugFPSText);

  • code/trunk/src/modules/overlays/debugging/DebugFPSText.h

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

  • code/trunk/src/modules/overlays/debugging/DebugRTRText.cc

    r5781 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(DebugRTRText);
     37    RegisterClass(DebugRTRText);
    3838
    39     DebugRTRText::DebugRTRText(BaseObject* creator) : OverlayText(creator)
     39    DebugRTRText::DebugRTRText(Context* context) : OverlayText(context)
    4040    {
    4141        RegisterObject(DebugRTRText);

  • code/trunk/src/modules/overlays/debugging/DebugRTRText.h

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

  • 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

  • code/trunk/src/modules/overlays/stats/Scoreboard.cc

    r7401 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(Scoreboard);
     37    RegisterClass(Scoreboard);
    3838
    3939    /**
    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/trunk/src/modules/overlays/stats/Scoreboard.h

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

  • code/trunk/src/modules/overlays/stats/Stats.cc

    r7401 r9667  
    3535#include "util/StringUtils.h"
    3636#include "core/CoreIncludes.h"
    37 #include "core/ConfigValueIncludes.h"
     37#include "core/config/ConfigValueIncludes.h"
    3838
    3939namespace orxonox
    4040{
    41     CreateFactory(Stats);
     41    RegisterClass(Stats);
    4242
    4343    /**
    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/trunk/src/modules/overlays/stats/Stats.h

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

  • code/trunk/src/modules/pickup/CollectiblePickup.cc

    r9348 r9667  
    3838#include "PickupCollection.h"
    3939
    40 namespace orxonox {
     40namespace orxonox
     41{
     42    RegisterAbstractClass(CollectiblePickup).inheritsFrom(Class(Pickupable));
    4143
    4244    /**

  • code/trunk/src/modules/pickup/Pickup.cc

    r9348 r9667  
    4848    /*static*/ const std::string Pickup::durationTypeContinuous_s = "continuous";
    4949
    50     CreateUnloadableFactory(Pickup);
     50    RegisterUnloadableClass(Pickup);
    5151
    5252    /**
    … …  
    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/trunk/src/modules/pickup/Pickup.h

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

  • code/trunk/src/modules/pickup/PickupCollection.cc

    r9348 r9667  
    4545{
    4646
    47     CreateFactory(PickupCollection);
     47    RegisterClass(PickupCollection);
    4848
    4949    /**
    … …  
    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/trunk/src/modules/pickup/PickupCollection.h

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

  • code/trunk/src/modules/pickup/PickupManager.cc

    r9348 r9667  
    3737#include "core/LuaState.h"
    3838#include "core/GUIManager.h"
    39 #include "core/Identifier.h"
     39#include "core/class/Identifier.h"
    4040#include "network/Host.h"
    4141#include "network/NetworkFunction.h"

  • code/trunk/src/modules/pickup/PickupManager.h

    r9348 r9667  
    3939
    4040#include <map>
    41 #include "core/WeakPtr.h"
     41#include "core/object/WeakPtr.h"
    4242
    4343#include "PickupRepresentation.h"

  • code/trunk/src/modules/pickup/PickupRepresentation.cc

    r9348 r9667  
    4545{
    4646
    47     CreateFactory(PickupRepresentation);
     47    RegisterClass(PickupRepresentation);
    4848
    4949    /**
    … …  
    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/trunk/src/modules/pickup/PickupRepresentation.h

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

  • code/trunk/src/modules/pickup/PickupSpawner.cc

    r9348 r9667  
    4747{
    4848
    49     CreateFactory(PickupSpawner);
     49    RegisterClass(PickupSpawner);
    5050
    5151    /**
    … …  
    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/trunk/src/modules/pickup/PickupSpawner.h

    r9348 r9667  
    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/trunk/src/modules/pickup/items/DamageBoostPickup.cc

    r9348 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(DamageBoostPickup);
     44    RegisterClass(DamageBoostPickup);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/pickup/items/DamageBoostPickup.h

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

  • code/trunk/src/modules/pickup/items/DronePickup.cc

    r9348 r9667  
    4545{
    4646
    47     CreateFactory(DronePickup);
     47    RegisterClass(DronePickup);
    4848
    4949    /**
    … …  
    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/trunk/src/modules/pickup/items/DronePickup.h

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

  • code/trunk/src/modules/pickup/items/HealthPickup.cc

    r9348 r9667  
    4747    /*static*/ const std::string HealthPickup::healthTypePermanent_s = "permanent";
    4848
    49     CreateFactory(HealthPickup);
     49    RegisterClass(HealthPickup);
    5050
    5151    /**
    … …  
    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/trunk/src/modules/pickup/items/HealthPickup.h

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

  • code/trunk/src/modules/pickup/items/InvisiblePickup.cc

    r9348 r9667  
    4545{
    4646
    47     CreateFactory(InvisiblePickup);
     47    RegisterClass(InvisiblePickup);
    4848
    4949    /**
    … …  
    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/trunk/src/modules/pickup/items/InvisiblePickup.h

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

  • code/trunk/src/modules/pickup/items/MetaPickup.cc

    r9348 r9667  
    4242namespace orxonox {
    4343
    44     CreateFactory(MetaPickup);
     44    RegisterClass(MetaPickup);
    4545
    4646    //! Setting the static variables to their values.
    … …  
    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/trunk/src/modules/pickup/items/MetaPickup.h

    r9348 r9667  
    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/trunk/src/modules/pickup/items/ShieldPickup.cc

    r9348 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(ShieldPickup);
     44    RegisterClass(ShieldPickup);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/pickup/items/ShieldPickup.h

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

  • code/trunk/src/modules/pickup/items/ShrinkPickup.cc

    r9348 r9667  
    4646namespace orxonox
    4747{
    48     CreateFactory(ShrinkPickup);
     48    RegisterClass(ShrinkPickup);
    4949
    5050    /**
    … …  
    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/trunk/src/modules/pickup/items/ShrinkPickup.h

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

  • code/trunk/src/modules/pickup/items/SpeedPickup.cc

    r9348 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(SpeedPickup);
     44    RegisterClass(SpeedPickup);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/pickup/items/SpeedPickup.h

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

  • code/trunk/src/modules/pong/Pong.cc

    r9348 r9667  
    3737#include "core/EventIncludes.h"
    3838#include "core/command/Executor.h"
    39 #include "core/ConfigValueIncludes.h"
     39#include "core/config/ConfigValueIncludes.h"
    4040
    4141#include "gamestates/GSLevel.h"
    … …  
    5353    CreateEventName(PongCenterpoint, left);
    5454
    55     CreateUnloadableFactory(Pong);
     55    RegisterUnloadableClass(Pong);
    5656
    5757    /**
    … …  
    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/trunk/src/modules/pong/Pong.h

    r9348 r9667  
    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/trunk/src/modules/pong/PongAI.cc

    r8952 r9667  
    3535
    3636#include "core/CoreIncludes.h"
    37 #include "core/ConfigValueIncludes.h"
     37#include "core/config/ConfigValueIncludes.h"
    3838#include "core/command/Executor.h"
    3939#include "tools/Timer.h"
    … …  
    4545namespace orxonox
    4646{
    47     CreateUnloadableFactory(PongAI);
     47    RegisterUnloadableClass(PongAI);
    4848
    4949    const static float MAX_REACTION_TIME = 0.4f;
    … …  
    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/trunk/src/modules/pong/PongAI.h

    r9016 r9667  
    4444
    4545#include "controllers/Controller.h"
     46#include "PongBall.h"
    4647
    4748namespace orxonox
    … …  
    6061    {
    6162        public:
    62             PongAI(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     63            PongAI(Context* context); //!< Constructor. Registers and initializes the object.
    6364            virtual ~PongAI();
    6465

  • code/trunk/src/modules/pong/PongBall.cc

    r8108 r9667  
    4343namespace orxonox
    4444{
    45     CreateFactory(PongBall);
     45    RegisterClass(PongBall);
    4646
    4747    const float PongBall::MAX_REL_Z_VELOCITY = 1.5;
    … …  
    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/trunk/src/modules/pong/PongBall.h

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

  • code/trunk/src/modules/pong/PongBat.cc

    r8108 r9667  
    3939namespace orxonox
    4040{
    41     CreateFactory(PongBat);
     41    RegisterClass(PongBat);
    4242
    4343    /**
    … …  
    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/trunk/src/modules/pong/PongBat.h

    r8706 r9667  
    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/trunk/src/modules/pong/PongBot.cc

    r8108 r9667  
    3939namespace orxonox
    4040{
    41     CreateFactory(PongBot);
     41    RegisterClass(PongBot);
    4242
    4343    /**
    … …  
    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/trunk/src/modules/pong/PongBot.h

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

  • code/trunk/src/modules/pong/PongCenterpoint.cc

    r8108 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(PongCenterpoint);
     43    RegisterClass(PongCenterpoint);
    4444
    4545    /**
    … …  
    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/trunk/src/modules/pong/PongCenterpoint.h

    r8108 r9667  
    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/trunk/src/modules/pong/PongScore.cc

    r9264 r9667  
    4444namespace orxonox
    4545{
    46     CreateFactory(PongScore);
     46    RegisterClass(PongScore);
    4747
    4848    /**
    … …  
    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/trunk/src/modules/pong/PongScore.h

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

  • code/trunk/src/modules/portals/PortalEndPoint.cc

    r9526 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(PortalEndPoint);
     44    RegisterClass(PortalEndPoint);
    4545
    4646    /*static*/ const std::string PortalEndPoint::EVENTFUNCTIONNAME = "execute";
    … …  
    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/trunk/src/modules/portals/PortalEndPoint.h

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

  • code/trunk/src/modules/portals/PortalLink.cc

    r8767 r9667  
    3636namespace orxonox
    3737{
    38     CreateFactory(PortalLink);
     38    RegisterClass(PortalLink);
    3939
    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/trunk/src/modules/portals/PortalLink.h

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

  • code/trunk/src/modules/questsystem/GlobalQuest.cc

    r8858 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(GlobalQuest);
     43    RegisterClass(GlobalQuest);
    4444
    4545    /**
    … …  
    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/trunk/src/modules/questsystem/GlobalQuest.h

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

  • code/trunk/src/modules/questsystem/LocalQuest.cc

    r8858 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(LocalQuest);
     43    RegisterClass(LocalQuest);
    4444
    4545    /**
    … …  
    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/trunk/src/modules/questsystem/LocalQuest.h

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

  • code/trunk/src/modules/questsystem/Quest.cc

    r8858 r9667  
    4545namespace orxonox
    4646{
     47    RegisterAbstractClass(Quest).inheritsFrom(Class(QuestItem));
     48
    4749    /**
    4850    @brief
    4951        Constructor. Registers and initializes object.
    5052    */
    51     Quest::Quest(BaseObject* creator) : QuestItem(creator)
     53    Quest::Quest(Context* context) : QuestItem(context)
    5254    {
    5355        RegisterObject(Quest);

  • code/trunk/src/modules/questsystem/Quest.h

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

  • code/trunk/src/modules/questsystem/QuestDescription.cc

    r8858 r9667  
    4444namespace orxonox
    4545{
    46     CreateFactory(QuestDescription);
     46    RegisterClass(QuestDescription);
    4747
    4848    /*static*/ const std::string QuestDescription::SENDER = "questsystem";
    … …  
    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/trunk/src/modules/questsystem/QuestDescription.h

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

  • code/trunk/src/modules/questsystem/QuestEffect.cc

    r8858 r9667  
    3737namespace orxonox
    3838{
     39    RegisterAbstractClass(QuestEffect).inheritsFrom(Class(BaseObject));
     40
    3941    /**
    4042    @brief
    … …  
    4244        Is not meant to be invoked directly, since this is only an interface.
    4345    */
    44     QuestEffect::QuestEffect(BaseObject* creator) : BaseObject(creator)
     46    QuestEffect::QuestEffect(Context* context) : BaseObject(context)
    4547    {
    4648        RegisterObject(QuestEffect);

  • code/trunk/src/modules/questsystem/QuestEffect.h

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

  • code/trunk/src/modules/questsystem/QuestEffectBeacon.cc

    r8858 r9667  
    4545namespace orxonox
    4646{
    47     CreateFactory(QuestEffectBeacon);
     47    RegisterClass(QuestEffectBeacon);
    4848
    4949    /**
    … …  
    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/trunk/src/modules/questsystem/QuestEffectBeacon.h

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

  • code/trunk/src/modules/questsystem/QuestHint.cc

    r8858 r9667  
    4343namespace orxonox
    4444{
    45     CreateFactory(QuestHint);
     45    RegisterClass(QuestHint);
    4646
    4747    /**
    … …  
    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/trunk/src/modules/questsystem/QuestHint.h

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

  • code/trunk/src/modules/questsystem/QuestItem.cc

    r8858 r9667  
    4242{
    4343
    44     CreateUnloadableFactory(QuestItem);
     44    RegisterUnloadableClass(QuestItem);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/questsystem/QuestItem.h

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

  • code/trunk/src/modules/questsystem/QuestListener.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(QuestListener);
     44    RegisterClass(QuestListener);
    4545
    4646    // Initialization of the static variables for the modes as strings.
    … …  
    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/trunk/src/modules/questsystem/QuestListener.h

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

  • code/trunk/src/modules/questsystem/QuestManager.cc

    r8952 r9667  
    3838#include "util/ScopedSingletonManager.h"
    3939#include "core/command/ConsoleCommand.h"
    40 #include "core/CoreIncludes.h"
    4140#include "core/GUIManager.h"
    4241#include "core/LuaState.h"
    … …  
    6059    QuestManager::QuestManager()
    6160    {
    62         RegisterRootObject(QuestManager);
    6361        orxout(internal_info, context::quests) << "QuestManager created." << endl;
    6462    }

  • code/trunk/src/modules/questsystem/QuestManager.h

    r8706 r9667  
    4343
    4444#include "util/Singleton.h"
    45 #include "core/OrxonoxClass.h"
    4645
    4746namespace orxonox  // tolua_export
    … …  
    5958    */
    6059    class _QuestsystemExport QuestManager  // tolua_export
    61         : public Singleton<QuestManager>, public orxonox::OrxonoxClass
     60        : public Singleton<QuestManager>
    6261    { // tolua_export
    6362

  • code/trunk/src/modules/questsystem/effects/AddQuest.cc

    r8858 r9667  
    4343namespace orxonox
    4444{
    45     CreateFactory(AddQuest);
     45    RegisterClass(AddQuest);
    4646
    4747    /**
    … …  
    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/trunk/src/modules/questsystem/effects/AddQuest.h

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

  • code/trunk/src/modules/questsystem/effects/AddQuestHint.cc

    r8858 r9667  
    4444namespace orxonox
    4545{
    46     CreateFactory(AddQuestHint);
     46    RegisterClass(AddQuestHint);
    4747
    4848    /**
    … …  
    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/trunk/src/modules/questsystem/effects/AddQuestHint.h

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

  • code/trunk/src/modules/questsystem/effects/AddReward.cc

    r8858 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(AddReward);
     43    RegisterClass(AddReward);
    4444
    4545    /**
    … …  
    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/trunk/src/modules/questsystem/effects/AddReward.h

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

  • code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
     44    RegisterAbstractClass(ChangeQuestStatus).inheritsFrom(Class(QuestEffect));
     45
    4446    /**
    4547    @brief
    4648        Constructor. Registers the object.
    4749    */
    48     ChangeQuestStatus::ChangeQuestStatus(BaseObject* creator) : QuestEffect(creator)
     50    ChangeQuestStatus::ChangeQuestStatus(Context* context) : QuestEffect(context)
    4951    {
    5052        RegisterObject(ChangeQuestStatus);

  • code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h

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

  • code/trunk/src/modules/questsystem/effects/CompleteQuest.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(CompleteQuest);
     44    RegisterClass(CompleteQuest);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/questsystem/effects/CompleteQuest.h

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

  • code/trunk/src/modules/questsystem/effects/FailQuest.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(FailQuest);
     44    RegisterClass(FailQuest);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/questsystem/effects/FailQuest.h

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

  • code/trunk/src/modules/tetris/Tetris.cc

    r9348 r9667  
    5454{
    5555
    56     CreateUnloadableFactory(Tetris);
     56    RegisterUnloadableClass(Tetris);
    5757
    5858    /**
    … …  
    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/trunk/src/modules/tetris/Tetris.h

    r9348 r9667  
    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/trunk/src/modules/tetris/TetrisBrick.cc

    r9348 r9667  
    4444namespace orxonox
    4545{
    46     CreateFactory(TetrisBrick);
     46    RegisterClass(TetrisBrick);
    4747
    4848    /**
    … …  
    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/trunk/src/modules/tetris/TetrisBrick.h

    r9348 r9667  
    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/trunk/src/modules/tetris/TetrisCenterpoint.cc

    r9348 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(TetrisCenterpoint);
     44    RegisterClass(TetrisCenterpoint);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/tetris/TetrisCenterpoint.h

    r9348 r9667  
    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/trunk/src/modules/tetris/TetrisScore.cc

    r9348 r9667  
    4545namespace orxonox
    4646{
    47     CreateFactory(TetrisScore);
     47    RegisterClass(TetrisScore);
    4848
    4949    /**
    … …  
    5252    @ingroup Tetris
    5353    */
    54     TetrisScore::TetrisScore(BaseObject* creator) : OverlayText(creator)
     54    TetrisScore::TetrisScore(Context* context) : OverlayText(context)
    5555    {
    5656        RegisterObject(TetrisScore);

  • code/trunk/src/modules/tetris/TetrisScore.h

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

  • code/trunk/src/modules/tetris/TetrisStone.cc

    r9348 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(TetrisStone);
     44    RegisterClass(TetrisStone);
    4545
    4646    /**
    … …  
    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/trunk/src/modules/tetris/TetrisStone.h

    r9348 r9667  
    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/trunk/src/modules/towerdefense/Tower.cc

    r9272 r9667  
    1616namespace orxonox
    1717{
    18     CreateFactory(Tower);
     18    RegisterClass(Tower);
    1919
    2020    /**
    … …  
    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/trunk/src/modules/towerdefense/Tower.h

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

  • code/trunk/src/modules/towerdefense/TowerDefense.cc

    r9347 r9667  
    8787
    8888#include "chat/ChatManager.h"
     89#include "core/CoreIncludes.h"
    8990
    9091/* Part of a temporary hack to allow the player to add towers */
    … …  
    9394namespace orxonox
    9495{
    95     CreateUnloadableFactory(TowerDefense);
    96 
    97     TowerDefense::TowerDefense(BaseObject* creator) : Deathmatch(creator)
     96    RegisterUnloadableClass(TowerDefense);
     97
     98    TowerDefense::TowerDefense(Context* context) : Deathmatch(context)
    9899    {
    99100        RegisterObject(TowerDefense);
    … …  
    189190
    190191        // Create tower
    191         Tower* newTower = new Tower(this->center_);
     192        Tower* newTower = new Tower(this->center_->getContext());
    192193        newTower->addTemplate(this->center_->getTowerTemplate());
    193194

  • code/trunk/src/modules/towerdefense/TowerDefense.h

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

  • code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc

    r9272 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(TowerDefenseCenterpoint);
     43    RegisterClass(TowerDefenseCenterpoint);
    4444
    4545    /**
    … …  
    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/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h

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

  • code/trunk/src/modules/towerdefense/TowerDefenseController.cc

    r9271 r9667  
    3636namespace orxonox
    3737{
    38     CreateFactory(TowerDefenseController);
     38    RegisterClass(TowerDefenseController);
    3939
    40     TowerDefenseController::TowerDefenseController(BaseObject* creator) : WaypointController(creator)
     40    TowerDefenseController::TowerDefenseController(Context* context) : WaypointController(context)
    4141    {
    4242        RegisterObject(TowerDefenseController);

  • code/trunk/src/modules/towerdefense/TowerDefenseController.h

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

  • code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc

    r9272 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(TowerDefenseHUDController);
     37    RegisterClass(TowerDefenseHUDController);
    3838
    39     TowerDefenseHUDController::TowerDefenseHUDController(BaseObject* creator) : OverlayText(creator)
     39    TowerDefenseHUDController::TowerDefenseHUDController(Context* context) : OverlayText(context)
    4040    {
    4141        RegisterObject(TowerDefenseHUDController);

  • code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h

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

  • code/trunk/src/modules/weapons/MuzzleFlash.cc

    r8855 r9667  
    3939namespace orxonox
    4040{
    41     CreateFactory(MuzzleFlash);
     41    RegisterClass(MuzzleFlash);
    4242
    43     MuzzleFlash::MuzzleFlash(BaseObject* creator) : Billboard(creator)
     43    MuzzleFlash::MuzzleFlash(Context* context) : Billboard(context)
    4444    {
    4545        RegisterObject(MuzzleFlash);

  • code/trunk/src/modules/weapons/MuzzleFlash.h

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

  • code/trunk/src/modules/weapons/RocketController.cc

    r9348 r9667  
    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/trunk/src/modules/weapons/RocketController.h

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

  • code/trunk/src/modules/weapons/munitions/FusionMunition.cc

    r8855 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(FusionMunition);
     39    RegisterClass(FusionMunition);
    4040
    41     FusionMunition::FusionMunition(BaseObject* creator) : Munition(creator)
     41    FusionMunition::FusionMunition(Context* context) : Munition(context)
    4242    {
    4343        RegisterObject(FusionMunition);

  • code/trunk/src/modules/weapons/munitions/FusionMunition.h

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

  • code/trunk/src/modules/weapons/munitions/LaserMunition.cc

    r8855 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(LaserMunition);
     39    RegisterClass(LaserMunition);
    4040
    41     LaserMunition::LaserMunition(BaseObject* creator) : ReplenishingMunition(creator)
     41    LaserMunition::LaserMunition(Context* context) : ReplenishingMunition(context)
    4242    {
    4343        RegisterObject(LaserMunition);

  • code/trunk/src/modules/weapons/munitions/LaserMunition.h

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

  • code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc

    r8855 r9667  
    3939namespace orxonox
    4040{
    41     CreateFactory(ReplenishingMunition);
     41    RegisterClass(ReplenishingMunition);
    4242
    43     ReplenishingMunition::ReplenishingMunition(BaseObject* creator) : Munition(creator)
     43    ReplenishingMunition::ReplenishingMunition(Context* context) : Munition(context)
    4444    {
    4545        RegisterObject(ReplenishingMunition);

  • code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h

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

  • code/trunk/src/modules/weapons/munitions/RocketMunition.cc

    r8855 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(RocketMunition);
     39    RegisterClass(RocketMunition);
    4040
    41     RocketMunition::RocketMunition(BaseObject* creator) : Munition(creator)
     41    RocketMunition::RocketMunition(Context* context) : Munition(context)
    4242    {
    4343        RegisterObject(RocketMunition);

  • code/trunk/src/modules/weapons/munitions/RocketMunition.h

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

  • code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc

    r8855 r9667  
    4242namespace orxonox
    4343{
     44    RegisterClassNoArgs(BasicProjectile);
     45
    4446    /**
    4547    @brief
    4648        Constructor. Registers the object and initializes some default values.
    4749    */
    48     BasicProjectile::BasicProjectile() : OrxonoxClass()
     50    BasicProjectile::BasicProjectile()
    4951    {
    50         RegisterRootObject(BasicProjectile);// Register the BasicProjectile class to the core
     52        RegisterObject(BasicProjectile);// Register the BasicProjectile class to the core
    5153
    5254        this->bDestroy_ = false;
    … …  
    106108                {
    107109                    {
    108                         ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getCreator());
     110                        ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
    109111                        effect->setPosition(entity->getPosition());
    110112                        effect->setOrientation(entity->getOrientation());
    … …  
    115117                    // Second effect with same condition
    116118                    {
    117                         ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getCreator());
     119                        ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
    118120                        effect->setPosition(entity->getPosition());
    119121                        effect->setOrientation(entity->getOrientation());
    … …  
    127129                if (victim && victim->hasShield() && (this->getDamage() > 0.0f || this->getShieldDamage() > 0.0f) && victim->getHealth() > 0.0f)
    128130                {
    129                     ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getCreator());
     131                    ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
    130132                    effect->setDestroyAfterLife(true);
    131133                    effect->setSource("Orxonox/Shield");

  • code/trunk/src/modules/weapons/projectiles/BasicProjectile.h

    r8858 r9667  
    3939#include "worldentities/pawns/Pawn.h"
    4040
    41 #include "core/OrxonoxClass.h"
     41#include "core/class/OrxonoxInterface.h"
    4242
    4343namespace orxonox
    … …  
    5252    @ingroup WeaponsProjectiles
    5353    */
    54     class _WeaponsExport BasicProjectile : public virtual OrxonoxClass
     54    class _WeaponsExport BasicProjectile : public virtual OrxonoxInterface
    5555    {
    5656        public:

  • code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc

    r8855 r9667  
    4040namespace orxonox
    4141{
    42     CreateFactory(BillboardProjectile);
     42    RegisterClass(BillboardProjectile);
    4343
    44     BillboardProjectile::BillboardProjectile(BaseObject* creator) : Projectile(creator)
     44    BillboardProjectile::BillboardProjectile(Context* context) : Projectile(context)
    4545    {
    4646        RegisterObject(BillboardProjectile);

  • code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h

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

  • code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc

    r8855 r9667  
    4040namespace orxonox
    4141{
    42     CreateFactory(LightningGunProjectile);
     42    RegisterClass(LightningGunProjectile);
    4343
    44     LightningGunProjectile::LightningGunProjectile(BaseObject* creator) : BillboardProjectile(creator)
     44    LightningGunProjectile::LightningGunProjectile(Context* context) : BillboardProjectile(context)
    4545    {
    4646        RegisterObject(LightningGunProjectile);

  • code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.h

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

  • code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc

    r8855 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(ParticleProjectile);
     43    RegisterClass(ParticleProjectile);
    4444
    45     ParticleProjectile::ParticleProjectile(BaseObject* creator) : BillboardProjectile(creator)
     45    ParticleProjectile::ParticleProjectile(Context* context) : BillboardProjectile(context)
    4646    {
    4747        RegisterObject(ParticleProjectile);
    … …  
    6565        {
    6666            this->detachOgreObject(this->particles_->getParticleSystem());
    67             this->particles_->destroy();
     67            delete this->particles_;
    6868        }
    6969    }

  • code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h

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

  • code/trunk/src/modules/weapons/projectiles/Projectile.cc

    r8855 r9667  
    3434#include "Projectile.h"
    3535
    36 #include "core/ConfigValueIncludes.h"
     36#include "core/config/ConfigValueIncludes.h"
    3737#include "core/CoreIncludes.h"
    3838#include "core/GameMode.h"
    … …  
    4444namespace orxonox
    4545{
    46     CreateFactory(Projectile);
     46    RegisterClass(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/trunk/src/modules/weapons/projectiles/Projectile.h

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

  • code/trunk/src/modules/weapons/projectiles/Rocket.cc

    r9016 r9667  
    5151namespace orxonox
    5252{
    53     CreateFactory(Rocket);
     53    RegisterClass(Rocket);
    5454
    5555    /**
    … …  
    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/trunk/src/modules/weapons/projectiles/Rocket.h

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

  • code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc

    r8859 r9667  
    5252namespace orxonox
    5353{
    54     CreateFactory(SimpleRocket);
     54    RegisterClass(SimpleRocket);
    5555
    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/trunk/src/modules/weapons/projectiles/SimpleRocket.h

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

  • code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc

    r8855 r9667  
    4949namespace orxonox
    5050{
    51     CreateFactory(EnergyDrink);
     51    RegisterClass(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/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h

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

  • code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc

    r8855 r9667  
    4646namespace orxonox
    4747{
    48     CreateFactory(FusionFire);
     48    RegisterClass(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/trunk/src/modules/weapons/weaponmodes/FusionFire.h

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

  • code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

    r9526 r9667  
    5050namespace orxonox
    5151{
    52     CreateFactory(HsW01);
     52    RegisterClass(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/trunk/src/modules/weapons/weaponmodes/HsW01.h

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

  • code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc

    r8855 r9667  
    4545namespace orxonox
    4646{
    47     CreateFactory(LaserFire);
     47    RegisterClass(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/trunk/src/modules/weapons/weaponmodes/LaserFire.h

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

  • code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc

    r9016 r9667  
    4444namespace orxonox
    4545{
    46     CreateFactory(LightningGun);
     46    RegisterClass(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/trunk/src/modules/weapons/weaponmodes/LightningGun.h

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

  • code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc

    r8855 r9667  
    4646namespace orxonox
    4747{
    48     CreateFactory(RocketFire);
     48    RegisterClass(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/trunk/src/modules/weapons/weaponmodes/RocketFire.h

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

  • code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

    r8855 r9667  
    5050{
    5151
    52     CreateFactory(SimpleRocketFire);
     52    RegisterClass(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/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.h

    r8855 r9667  
    5050    {
    5151        public:
    52             SimpleRocketFire(BaseObject* creator);
     52            SimpleRocketFire(Context* context);
    5353            virtual ~SimpleRocketFire();
    5454            void deactivateFire();
Note: See TracChangeset for help on using the changeset viewer.