Changeset 5722 for code/branches/libraries2/src/modules/questsystem

Timestamp:

Aug 31, 2009, 5:37:33 PM (15 years ago)

Author:

landauf

Message:

renamed QuestPrereqs.h as QuestsystemPrereqs.h and _QuestExport as _QuestsystemExport
fixed paths to QuestsystemPrereqs.h and other includes
compiles now

Location:

code/branches/libraries2/src/modules/questsystem

Files:

• AddQuest.h (modified) (2 diffs)
• AddQuestHint.h (modified) (2 diffs)
• AddReward.h (modified) (2 diffs)
• CMakeLists.txt (modified) (3 diffs)
• ChangeQuestStatus.h (modified) (2 diffs)
• CompleteQuest.h (modified) (2 diffs)
• FailQuest.h (modified) (2 diffs)
• GlobalQuest.h (modified) (2 diffs)
• LocalQuest.h (modified) (2 diffs)
• Quest.h (modified) (2 diffs)
• QuestDescription.h (modified) (2 diffs)
• QuestEffect.h (modified) (2 diffs)
• QuestEffectBeacon.h (modified) (2 diffs)
• QuestHint.h (modified) (2 diffs)
• QuestItem.h (modified) (2 diffs)
• QuestListener.h (modified) (2 diffs)
• QuestManager.h (modified) (2 diffs)
• QuestNotification.h (modified) (2 diffs)
• QuestsystemPrereqs.h (moved) (moved from code/branches/libraries2/src/modules/questsystem/QuestPrereqs.h) (1 diff)
• notifications/CMakeLists.txt (modified) (1 diff)
• notifications/Notification.h (modified) (2 diffs)
• notifications/NotificationManager.h (modified) (2 diffs)
• notifications/NotificationOverlay.cc (modified) (1 diff)
• notifications/NotificationOverlay.h (modified) (2 diffs)
• notifications/NotificationQueue.cc (modified) (1 diff)
• notifications/NotificationQueue.h (modified) (2 diffs)

code/branches/libraries2/src/modules/questsystem/AddQuest.h

@@ -35 +35 @@
 #define _AddQuest_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 #include "ChangeQuestStatus.h"
 
@@ -50 +50 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport AddQuest : public ChangeQuestStatus
+    class _QuestsystemExport AddQuest : public ChangeQuestStatus
     {
         public:

code/branches/libraries2/src/modules/questsystem/AddQuestHint.h

@@ -35 +35 @@
 #define _AddQuestHint_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -52 +52 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport AddQuestHint : public QuestEffect
+    class _QuestsystemExport AddQuestHint : public QuestEffect
     {
         public:

code/branches/libraries2/src/modules/questsystem/AddReward.h

@@ -35 +35 @@
 #define _AddReward_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <list>
@@ -56 +56 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport AddReward : public QuestEffect
+    class _QuestsystemExport AddReward : public QuestEffect
     {
         public:

code/branches/libraries2/src/modules/questsystem/CMakeLists.txt

@@ -1 @@
-SET_SOURCE_FILES(QUEST_SRC_FILES
+SET_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
   AddQuest.cc
   AddQuestHint.cc
@@ -21 +21 @@
 ADD_SUBDIRECTORY(notifications)
 
-# add the parent directory for tolua (TODO: remove this if the quest module is moved somewhere else)
-INCLUDE_DIRECTORIES(..)
-
-ORXONOX_ADD_LIBRARY(quest
+ORXONOX_ADD_LIBRARY(questsystem
   MODULE
   TOLUA_FILES
@@ -30 +27 @@
     QuestManager.h
   DEFINE_SYMBOL
-    "QUEST_SHARED_BUILD"
+    "QUESTSYSTEM_SHARED_BUILD"
   LINK_LIBRARIES
     orxonox
     overlays
-  SOURCE_FILES ${QUEST_SRC_FILES}
+  SOURCE_FILES ${QUESTSYSTEM_SRC_FILES}
 )

code/branches/libraries2/src/modules/questsystem/ChangeQuestStatus.h

@@ -35 +35 @@
 #define _ChangeQuestStatus_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -48 +48 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport ChangeQuestStatus : public QuestEffect
+    class _QuestsystemExport ChangeQuestStatus : public QuestEffect
     {
         public:

code/branches/libraries2/src/modules/questsystem/CompleteQuest.h

@@ -35 +35 @@
 #define _CompleteQuest_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 #include "ChangeQuestStatus.h"
 
@@ -50 +50 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport CompleteQuest : public ChangeQuestStatus
+    class _QuestsystemExport CompleteQuest : public ChangeQuestStatus
     {
         public:

code/branches/libraries2/src/modules/questsystem/FailQuest.h

@@ -35 +35 @@
 #define _FailQuest_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 #include "ChangeQuestStatus.h"
 
@@ -50 +50 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport FailQuest : public ChangeQuestStatus
+    class _QuestsystemExport FailQuest : public ChangeQuestStatus
     {
         public:

code/branches/libraries2/src/modules/questsystem/GlobalQuest.h

@@ -35 +35 @@
 #define _GlobalQuest_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <list>
@@ -81 +81 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport GlobalQuest : public Quest
+    class _QuestsystemExport GlobalQuest : public Quest
     {
         public:

code/branches/libraries2/src/modules/questsystem/LocalQuest.h

@@ -35 +35 @@
 #define _LocalQuest_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <map>
@@ -75 +75 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport LocalQuest : public Quest
+    class _QuestsystemExport LocalQuest : public Quest
     {
         public:

code/branches/libraries2/src/modules/questsystem/Quest.h

@@ -36 +36 @@
 #define _Quest_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <list>
@@ -67 +67 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport Quest : public QuestItem
+    class _QuestsystemExport Quest : public QuestItem
     {
         public:

code/branches/libraries2/src/modules/questsystem/QuestDescription.h

@@ -35 +35 @@
 #define _QuestDescription_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -54 +54 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport QuestDescription : public BaseObject
+    class _QuestsystemExport QuestDescription : public BaseObject
     {
 // tolua_end

code/branches/libraries2/src/modules/questsystem/QuestEffect.h

@@ -35 +35 @@
 #define _QuestEffect_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <list>
@@ -49 +49 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport QuestEffect : public BaseObject
+    class _QuestsystemExport QuestEffect : public BaseObject
     {
         public:

code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h

@@ -35 +35 @@
 #define _QuestEffectBeacon_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <list>
@@ -79 +79 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport QuestEffectBeacon : public StaticEntity
+    class _QuestsystemExport QuestEffectBeacon : public StaticEntity
     {
         public:

code/branches/libraries2/src/modules/questsystem/QuestHint.h

@@ -35 +35 @@
 #define _QuestHint_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <map>
@@ -66 +66 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport QuestHint : public QuestItem
+    class _QuestsystemExport QuestHint : public QuestItem
     {
 

code/branches/libraries2/src/modules/questsystem/QuestItem.h

@@ -37 +37 @@
 #define _QuestItem_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -51 +51 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport QuestItem : public BaseObject
+    class _QuestsystemExport QuestItem : public BaseObject
     {
 

code/branches/libraries2/src/modules/questsystem/QuestListener.h

@@ -35 +35 @@
 #define _QuestListener_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -72 +72 @@
     Damian 'Mozork' Frick
     */
-    class _QuestExport QuestListener : public BaseObject
+    class _QuestsystemExport QuestListener : public BaseObject
     {
     public:

code/branches/libraries2/src/modules/questsystem/QuestManager.h

@@ -35 +35 @@
 #define _QuestManager_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <list>
@@ -75 +75 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport QuestManager : public ScopedSingletonQuestManagerGSLevel, public orxonox::OrxonoxClass
+    class _QuestsystemExport QuestManager : public ScopedSingletonQuestManagerGSLevel, public orxonox::OrxonoxClass
     {
 // tolua_end

code/branches/libraries2/src/modules/questsystem/QuestNotification.h

@@ -30 +30 @@
 #define _QuestNotification_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -43 +43 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport QuestNotification : public Notification
+    class _QuestsystemExport QuestNotification : public Notification
     {
         public:

code/branches/libraries2/src/modules/questsystem/QuestsystemPrereqs.h

@@ -43 +43 @@
 //-----------------------------------------------------------------------
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
-#  ifdef QUEST_SHARED_BUILD
-#    define _QuestExport __declspec(dllexport)
+#  ifdef QUESTSYSTEM_SHARED_BUILD
+#    define _QuestsystemExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )
-#      define _QuestExport
+#      define _QuestsystemExport
 #    else
-#      define _QuestExport __declspec(dllimport)
+#      define _QuestsystemExport __declspec(dllimport)
 #    endif
 #  endif
 #elif defined ( ORXONOX_GCC_VISIBILITY )
-#  define _QuestExport  __attribute__ ((visibility("default")))
+#  define _QuestsystemExport  __attribute__ ((visibility("default")))
 #else
-#  define _QuestExport
+#  define _QuestsystemExport
 #endif
 

code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(QUEST_SRC_FILES
+ADD_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
   Notification.cc
   NotificationManager.cc

code/branches/libraries2/src/modules/questsystem/notifications/Notification.h

@@ -35 +35 @@
 #define _Notification_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -49 +49 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport Notification : public BaseObject
+    class _QuestsystemExport Notification : public BaseObject
     {
         public:

code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h

@@ -35 +35 @@
 #define _NotificationManager_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <ctime>
@@ -54 +54 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::GSLevel>, public OrxonoxClass
+    class _QuestsystemExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::GSLevel>, public OrxonoxClass
     {
             friend class ScopedSingleton<NotificationManager, ScopeID::GSLevel>;

code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc

@@ -36 +36 @@
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"
-#include "objects/quest/notifications/Notification.h"
+#include "Notification.h"
 #include "NotificationQueue.h"
 

code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h

@@ -36 +36 @@
 #define _NotificationOverlay_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -50 +50 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport NotificationOverlay : public OverlayText
+    class _QuestsystemExport NotificationOverlay : public OverlayText
     {
 

code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc

@@ -39 +39 @@
 #include "core/XMLPort.h"
 #include "NotificationOverlay.h"
-#include "objects/quest/notifications/NotificationManager.h"
+#include "NotificationManager.h"
 
 namespace orxonox

code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h

@@ -35 +35 @@
 #define _NotificationOueue_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <ctime>
@@ -85 +85 @@
     */
 
-    class _QuestExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
+    class _QuestsystemExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
     {