Changeset 10624 for code/trunk/src/modules/questsystem

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/questsystem/Quest.cc (modified) (1 diff)
• src/modules/questsystem/QuestEffect.cc (modified) (1 diff)
• src/modules/questsystem/QuestManager.cc (modified) (2 diffs)
• src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) (1 diff)

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

@@ -45 +45 @@
 namespace orxonox
 {
-    RegisterAbstractClass(Quest).inheritsFrom(Class(QuestItem));
+    RegisterAbstractClass(Quest).inheritsFrom<QuestItem>();
 
     /**

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

@@ -37 +37 @@
 namespace orxonox
 {
-    RegisterAbstractClass(QuestEffect).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(QuestEffect).inheritsFrom<BaseObject>();
 
     /**

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

@@ -36 +36 @@
 #include "util/Exception.h"
 #include "util/OrxAssert.h"
-#include "util/ScopedSingletonManager.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/command/ConsoleCommand.h"
 #include "core/GUIManager.h"
@@ -49 +49 @@
 namespace orxonox
 {
-    ManageScopedSingleton(QuestManager, ScopeID::Root, false);
+    ManageScopedSingleton(QuestManager, ScopeID::ROOT, false);
 
     /**

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

@@ -42 +42 @@
 namespace orxonox
 {
-    RegisterAbstractClass(ChangeQuestStatus).inheritsFrom(Class(QuestEffect));
+    RegisterAbstractClass(ChangeQuestStatus).inheritsFrom<QuestEffect>();
 
     /**