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

Legend:

Unmodified
Added
Removed

  • code/trunk

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