Changeset 2095 for code/trunk

Timestamp:

Nov 1, 2008, 9:56:23 PM (16 years ago)

Author:

landauf

Message:

• added forward declarations of all quest classes to OrxonoxPrereqs.h
• moved some includes from .h to .cc

Location:

code/trunk/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• objects/quest/AddQuest.h (modified) (2 diffs)
• objects/quest/AddQuestHint.cc (modified) (1 diff)
• objects/quest/AddQuestHint.h (modified) (2 diffs)
• objects/quest/AddReward.cc (modified) (1 diff)
• objects/quest/AddReward.h (modified) (2 diffs)
• objects/quest/ChangeQuestStatus.h (modified) (2 diffs)
• objects/quest/CompleteQuest.h (modified) (2 diffs)
• objects/quest/FailQuest.h (modified) (2 diffs)
• objects/quest/GlobalQuest.h (modified) (2 diffs)
• objects/quest/LocalQuest.h (modified) (2 diffs)
• objects/quest/Quest.cc (modified) (1 diff)
• objects/quest/Quest.h (modified) (2 diffs)
• objects/quest/QuestDescription.h (modified) (2 diffs)
• objects/quest/QuestEffect.h (modified) (2 diffs)
• objects/quest/QuestHint.h (modified) (3 diffs)
• objects/quest/QuestItem.cc (modified) (1 diff)
• objects/quest/QuestItem.h (modified) (2 diffs)
• objects/quest/QuestManager.cc (modified) (1 diff)
• objects/quest/QuestManager.h (modified) (2 diffs)
• objects/quest/Rewardable.h (modified) (2 diffs)

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -86 +86 @@
     class Scene;
 
+    class AddQuest;
+    class AddQuestHint;
+    class AddReward;
+    class ChangeQuestStatus;
+    class CompleteQuest;
+    class FailQuest;
+    class GlobalQuest;
+    class LocalQuest;
+    class Quest;
+    class QuestDescription;
+    class QuestEffect;
+    class QuestHint;
+    class QuestItem;
+    class QuestManager;
+    class Rewardable;
+
     class WorldEntity;
     class PositionableEntity;

code/trunk/src/orxonox/objects/quest/AddQuest.h

@@ -30 +30 @@
 #define _AddQuest_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
@@ -45 +47 @@
         Damian 'Mozork' Frick
     */
-    class AddQuest : public ChangeQuestStatus
+    class _OrxonoxExport AddQuest : public ChangeQuestStatus
     {
         public:

code/trunk/src/orxonox/objects/quest/AddQuestHint.cc

@@ -30 +30 @@
 #include "util/Exception.h"
 
+#include "AddQuestHint.h"
 #include "QuestManager.h"
 #include "QuestItem.h"
-#include "AddQuestHint.h"
+#include "QuestHint.h"
 
 namespace orxonox {

code/trunk/src/orxonox/objects/quest/AddQuestHint.h

@@ -30 +30 @@
 #define _AddQuestHint_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
@@ -44 +46 @@
         Damian 'Mozork' Frick
     */
-    class AddQuestHint : public QuestEffect
+    class _OrxonoxExport AddQuestHint : public QuestEffect
     {
         public:

code/trunk/src/orxonox/objects/quest/AddReward.cc

@@ -30 +30 @@
 
 #include "AddReward.h"
+#include "Rewardable.h"
 
 namespace orxonox {

code/trunk/src/orxonox/objects/quest/AddReward.h

@@ -30 +30 @@
 #define _AddReward_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <list>
 
 #include "core/XMLPort.h"
-#include "Rewardable.h"
 #include "QuestEffect.h"
 
@@ -46 +47 @@
         Damian 'Mozork' Frick
     */
-    class AddReward : public QuestEffect
+    class _OrxonoxExport AddReward : public QuestEffect
     {
         public:

code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h

@@ -30 +30 @@
 #define _ChangeQuestStatus_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
@@ -45 +47 @@
         Damian 'Mozork' Frick
     */
-    class ChangeQuestStatus : public QuestEffect
+    class _OrxonoxExport ChangeQuestStatus : public QuestEffect
     {
         public:

code/trunk/src/orxonox/objects/quest/CompleteQuest.h

@@ -30 +30 @@
 #define _CompleteQuest_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
@@ -45 +47 @@
         Damian 'Mozork' Frick
     */
-    class CompleteQuest : public ChangeQuestStatus
+    class _OrxonoxExport CompleteQuest : public ChangeQuestStatus
     {
         public:

code/trunk/src/orxonox/objects/quest/FailQuest.h

@@ -30 +30 @@
 #define _FailQuest_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
@@ -45 +47 @@
         Damian 'Mozork' Frick
     */
-    class FailQuest : public ChangeQuestStatus
+    class _OrxonoxExport FailQuest : public ChangeQuestStatus
     {
         public:

code/trunk/src/orxonox/objects/quest/GlobalQuest.h

@@ -30 +30 @@
 #define _GlobalQuest_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <set>
 
@@ -46 +48 @@
         Damian 'Mozork' Frick
     */
-    class GlobalQuest : public Quest
+    class _OrxonoxExport GlobalQuest : public Quest
     {
         public:

code/trunk/src/orxonox/objects/quest/LocalQuest.h

@@ -30 +30 @@
 #define _LocalQuest_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <map>
 #include <string>
@@ -46 +48 @@
         Damian 'Mozork' Frick
     */
-    class LocalQuest : public Quest
+    class _OrxonoxExport LocalQuest : public Quest
     {
         public:

code/trunk/src/orxonox/objects/quest/Quest.cc

@@ -31 +31 @@
 #include "Quest.h"
 #include "QuestManager.h"
+#include "QuestDescription.h"
+#include "QuestHint.h"
+#include "QuestEffect.h"
 
 namespace orxonox {

code/trunk/src/orxonox/objects/quest/Quest.h

@@ -30 +30 @@
 #define _Quest_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <list>
 #include <string>
 
 #include "core/XMLPort.h"
-#include "QuestDescription.h"
 #include "QuestItem.h"
-#include "QuestHint.h"
-#include "QuestEffect.h"
 
 namespace questStatus
@@ -64 +63 @@
         Damian 'Mozork' Frick
     */
-    class Quest : public QuestItem
+    class _OrxonoxExport Quest : public QuestItem
     {
         public:

code/trunk/src/orxonox/objects/quest/QuestDescription.h

@@ -30 +30 @@
 #define _QuestDescription_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
@@ -44 +46 @@
         Damian 'Mozork' Frick
     */
-    class QuestDescription : public BaseObject {
+    class _OrxonoxExport QuestDescription : public BaseObject {
 
         public:

code/trunk/src/orxonox/objects/quest/QuestEffect.h

@@ -30 +30 @@
 #define _QuestEffect_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <list>
 
@@ -44 +46 @@
         Damian 'Mozork' Frick
     */
-    class QuestEffect : public BaseObject
+    class _OrxonoxExport QuestEffect : public BaseObject
     {
         public:

code/trunk/src/orxonox/objects/quest/QuestHint.h

@@ -30 +30 @@
 #define _QuestHint_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <map>
 #include <string>
 
 #include "core/XMLPort.h"
-#include "QuestDescription.h"
 #include "QuestItem.h"
 
@@ -52 +53 @@
 
     class Player; //Forward declaration, remove when fully integrated into the objecthirarchy.
-    class Quest; //To avoid circual includes.
 
     /**
@@ -62 +62 @@
         Damian 'Mozork' Frick
     */
-    class QuestHint : public QuestItem
+    class _OrxonoxExport QuestHint : public QuestItem
     {
 

code/trunk/src/orxonox/objects/quest/QuestItem.cc

@@ -30 +30 @@
 
 #include "QuestItem.h"
+#include "QuestDescription.h"
 
 namespace orxonox {

code/trunk/src/orxonox/objects/quest/QuestItem.h

@@ -30 +30 @@
 #define _QuestItem_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include "core/BaseObject.h"
 #include "core/XMLPort.h"
-#include "QuestDescription.h"
 
 namespace orxonox {
@@ -46 +47 @@
         Damian 'Mozork' Frick
     */
-    class QuestItem : public BaseObject
+    class _OrxonoxExport QuestItem : public BaseObject
     {
 

code/trunk/src/orxonox/objects/quest/QuestManager.cc

@@ -31 +31 @@
 
 #include "QuestManager.h"
+#include "Quest.h"
+#include "QuestHint.h"
 
 namespace orxonox {

code/trunk/src/orxonox/objects/quest/QuestManager.h

@@ -30 +30 @@
 #define _QuestManager_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <map>
 #include <string>
 
 #include "core/BaseObject.h"
-#include "Quest.h"
-#include "QuestHint.h"
 
 namespace orxonox {
@@ -46 +46 @@
         Damian 'Mozork' Frick
     */
-    class QuestManager : public BaseObject
+    class _OrxonoxExport QuestManager : public BaseObject
     {
 

code/trunk/src/orxonox/objects/quest/Rewardable.h

@@ -30 +30 @@
 #define _Rewardable_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include "core/BaseObject.h"
 
@@ -42 +44 @@
         Damian 'Mozork' Frick
     */
-    class Rewardable : public BaseObject
+    class _OrxonoxExport Rewardable : public BaseObject
     {