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

Legend:

Unmodified
Added
Removed

  • code/trunk

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