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

Legend:

Unmodified
Added
Removed

  • code/trunk

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