Changeset 9667 for code/trunk/src/modules/questsystem/effects

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/questsystem/effects/AddQuest.cc (modified) (2 diffs)
• src/modules/questsystem/effects/AddQuest.h (modified) (1 diff)
• src/modules/questsystem/effects/AddQuestHint.cc (modified) (2 diffs)
• src/modules/questsystem/effects/AddQuestHint.h (modified) (1 diff)
• src/modules/questsystem/effects/AddReward.cc (modified) (2 diffs)
• src/modules/questsystem/effects/AddReward.h (modified) (1 diff)
• src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) (1 diff)
• src/modules/questsystem/effects/ChangeQuestStatus.h (modified) (1 diff)
• src/modules/questsystem/effects/CompleteQuest.cc (modified) (2 diffs)
• src/modules/questsystem/effects/CompleteQuest.h (modified) (1 diff)
• src/modules/questsystem/effects/FailQuest.cc (modified) (2 diffs)
• src/modules/questsystem/effects/FailQuest.h (modified) (1 diff)

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

@@ -43 +43 @@
 namespace orxonox
 {
-    CreateFactory(AddQuest);
+    RegisterClass(AddQuest);
 
     /**
@@ -49 +49 @@
         Constructor. Registers the object.
     */
-    AddQuest::AddQuest(BaseObject* creator) : ChangeQuestStatus(creator)
+    AddQuest::AddQuest(Context* context) : ChangeQuestStatus(context)
     {
         RegisterObject(AddQuest);

code/trunk/src/modules/questsystem/effects/AddQuest.h

@@ -59 +59 @@
     {
         public:
-        AddQuest(BaseObject* creator);
+        AddQuest(Context* context);
         virtual ~AddQuest();
 

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

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(AddQuestHint);
+    RegisterClass(AddQuestHint);
 
     /**
@@ -50 +50 @@
         Constructor. Registers the object.
     */
-    AddQuestHint::AddQuestHint(BaseObject* creator) : QuestEffect(creator)
+    AddQuestHint::AddQuestHint(Context* context) : QuestEffect(context)
     {
         RegisterObject(AddQuestHint);

code/trunk/src/modules/questsystem/effects/AddQuestHint.h

@@ -61 +61 @@
     {
         public:
-            AddQuestHint(BaseObject* creator);
+            AddQuestHint(Context* context);
             virtual ~AddQuestHint();
 

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

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(AddReward);
+    RegisterClass(AddReward);
 
     /**
@@ -47 +47 @@
         Constructor. Registers the object.
     */
-    AddReward::AddReward(BaseObject* creator) : QuestEffect(creator)
+    AddReward::AddReward(Context* context) : QuestEffect(context)
     {
         RegisterObject(AddReward);

code/trunk/src/modules/questsystem/effects/AddReward.h

@@ -65 +65 @@
     {
         public:
-            AddReward(BaseObject* creator);
+            AddReward(Context* context);
             virtual ~AddReward();
 

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

@@ -42 +42 @@
 namespace orxonox
 {
+    RegisterAbstractClass(ChangeQuestStatus).inheritsFrom(Class(QuestEffect));
+
     /**
     @brief
         Constructor. Registers the object.
     */
-    ChangeQuestStatus::ChangeQuestStatus(BaseObject* creator) : QuestEffect(creator)
+    ChangeQuestStatus::ChangeQuestStatus(Context* context) : QuestEffect(context)
     {
         RegisterObject(ChangeQuestStatus);

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

@@ -56 +56 @@
     {
         public:
-            ChangeQuestStatus(BaseObject* creator);
+            ChangeQuestStatus(Context* context);
             virtual ~ChangeQuestStatus();
 

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

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(CompleteQuest);
+    RegisterClass(CompleteQuest);
 
     /**
@@ -48 +48 @@
         Constructor. Registers the object.
     */
-    CompleteQuest::CompleteQuest(BaseObject* creator) : ChangeQuestStatus(creator)
+    CompleteQuest::CompleteQuest(Context* context) : ChangeQuestStatus(context)
     {
         RegisterObject(CompleteQuest);

code/trunk/src/modules/questsystem/effects/CompleteQuest.h

@@ -59 +59 @@
     {
         public:
-            CompleteQuest(BaseObject* creator);
+            CompleteQuest(Context* context);
             virtual ~CompleteQuest();
 

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

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(FailQuest);
+    RegisterClass(FailQuest);
 
     /**
@@ -48 +48 @@
         Constructor. Registers the object.
     */
-    FailQuest::FailQuest(BaseObject* creator) : ChangeQuestStatus(creator)
+    FailQuest::FailQuest(Context* context) : ChangeQuestStatus(context)
     {
         RegisterObject(FailQuest);

code/trunk/src/modules/questsystem/effects/FailQuest.h

@@ -59 +59 @@
     {
         public:
-            FailQuest(BaseObject* creator);
+            FailQuest(Context* context);
             virtual ~FailQuest();