[Orxonox-commit 1001] r5722 - in code/branches/libraries2/src: modules modules/questsystem modules/questsystem/notifications orxonox/objects
landauf at orxonox.net
landauf at orxonox.net
Mon Aug 31 17:37:34 CEST 2009
Author: landauf
Date: 2009-08-31 17:37:33 +0200 (Mon, 31 Aug 2009)
New Revision: 5722
Added:
code/branches/libraries2/src/modules/questsystem/QuestsystemPrereqs.h
Removed:
code/branches/libraries2/src/modules/questsystem/QuestPrereqs.h
Modified:
code/branches/libraries2/src/modules/CMakeLists.txt
code/branches/libraries2/src/modules/questsystem/AddQuest.h
code/branches/libraries2/src/modules/questsystem/AddQuestHint.h
code/branches/libraries2/src/modules/questsystem/AddReward.h
code/branches/libraries2/src/modules/questsystem/CMakeLists.txt
code/branches/libraries2/src/modules/questsystem/ChangeQuestStatus.h
code/branches/libraries2/src/modules/questsystem/CompleteQuest.h
code/branches/libraries2/src/modules/questsystem/FailQuest.h
code/branches/libraries2/src/modules/questsystem/GlobalQuest.h
code/branches/libraries2/src/modules/questsystem/LocalQuest.h
code/branches/libraries2/src/modules/questsystem/Quest.h
code/branches/libraries2/src/modules/questsystem/QuestDescription.h
code/branches/libraries2/src/modules/questsystem/QuestEffect.h
code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h
code/branches/libraries2/src/modules/questsystem/QuestHint.h
code/branches/libraries2/src/modules/questsystem/QuestItem.h
code/branches/libraries2/src/modules/questsystem/QuestListener.h
code/branches/libraries2/src/modules/questsystem/QuestManager.h
code/branches/libraries2/src/modules/questsystem/QuestNotification.h
code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt
code/branches/libraries2/src/modules/questsystem/notifications/Notification.h
code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h
code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc
code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h
code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc
code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h
code/branches/libraries2/src/orxonox/objects/CMakeLists.txt
Log:
renamed QuestPrereqs.h as QuestsystemPrereqs.h and _QuestExport as _QuestsystemExport
fixed paths to QuestsystemPrereqs.h and other includes
compiles now
Modified: code/branches/libraries2/src/modules/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/CMakeLists.txt 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/CMakeLists.txt 2009-08-31 15:37:33 UTC (rev 5722)
@@ -21,3 +21,4 @@
ADD_SUBDIRECTORY(gamestates)
ADD_SUBDIRECTORY(overlays)
+ADD_SUBDIRECTORY(questsystem)
Modified: code/branches/libraries2/src/modules/questsystem/AddQuest.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/AddQuest.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/AddQuest.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _AddQuest_H__
#define _AddQuest_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include "ChangeQuestStatus.h"
namespace orxonox
@@ -49,7 +49,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport AddQuest : public ChangeQuestStatus
+ class _QuestsystemExport AddQuest : public ChangeQuestStatus
{
public:
AddQuest(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/AddQuestHint.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/AddQuestHint.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/AddQuestHint.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _AddQuestHint_H__
#define _AddQuestHint_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <string>
#include "QuestEffect.h"
@@ -51,7 +51,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport AddQuestHint : public QuestEffect
+ class _QuestsystemExport AddQuestHint : public QuestEffect
{
public:
AddQuestHint(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/AddReward.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/AddReward.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/AddReward.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _AddReward_H__
#define _AddReward_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <list>
#include "QuestEffect.h"
@@ -55,7 +55,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport AddReward : public QuestEffect
+ class _QuestsystemExport AddReward : public QuestEffect
{
public:
AddReward(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/questsystem/CMakeLists.txt 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/CMakeLists.txt 2009-08-31 15:37:33 UTC (rev 5722)
@@ -1,4 +1,4 @@
-SET_SOURCE_FILES(QUEST_SRC_FILES
+SET_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
AddQuest.cc
AddQuestHint.cc
AddReward.cc
@@ -20,18 +20,15 @@
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
QuestDescription.h
QuestManager.h
DEFINE_SYMBOL
- "QUEST_SHARED_BUILD"
+ "QUESTSYSTEM_SHARED_BUILD"
LINK_LIBRARIES
orxonox
overlays
- SOURCE_FILES ${QUEST_SRC_FILES}
+ SOURCE_FILES ${QUESTSYSTEM_SRC_FILES}
)
Modified: code/branches/libraries2/src/modules/questsystem/ChangeQuestStatus.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/ChangeQuestStatus.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/ChangeQuestStatus.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _ChangeQuestStatus_H__
#define _ChangeQuestStatus_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <string>
#include "QuestEffect.h"
@@ -47,7 +47,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport ChangeQuestStatus : public QuestEffect
+ class _QuestsystemExport ChangeQuestStatus : public QuestEffect
{
public:
ChangeQuestStatus(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/CompleteQuest.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/CompleteQuest.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/CompleteQuest.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _CompleteQuest_H__
#define _CompleteQuest_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include "ChangeQuestStatus.h"
namespace orxonox
@@ -49,7 +49,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport CompleteQuest : public ChangeQuestStatus
+ class _QuestsystemExport CompleteQuest : public ChangeQuestStatus
{
public:
CompleteQuest(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/FailQuest.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/FailQuest.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/FailQuest.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _FailQuest_H__
#define _FailQuest_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include "ChangeQuestStatus.h"
namespace orxonox
@@ -49,7 +49,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport FailQuest : public ChangeQuestStatus
+ class _QuestsystemExport FailQuest : public ChangeQuestStatus
{
public:
FailQuest(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/GlobalQuest.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/GlobalQuest.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/GlobalQuest.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _GlobalQuest_H__
#define _GlobalQuest_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <list>
#include <set>
@@ -80,7 +80,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport GlobalQuest : public Quest
+ class _QuestsystemExport GlobalQuest : public Quest
{
public:
GlobalQuest(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/LocalQuest.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/LocalQuest.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/LocalQuest.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _LocalQuest_H__
#define _LocalQuest_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <map>
#include "Quest.h"
@@ -74,7 +74,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport LocalQuest : public Quest
+ class _QuestsystemExport LocalQuest : public Quest
{
public:
LocalQuest(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/Quest.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/Quest.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/Quest.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -35,7 +35,7 @@
#ifndef _Quest_H__
#define _Quest_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <list>
#include "QuestItem.h"
@@ -66,7 +66,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport Quest : public QuestItem
+ class _QuestsystemExport Quest : public QuestItem
{
public:
Quest(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/QuestDescription.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestDescription.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestDescription.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _QuestDescription_H__
#define _QuestDescription_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <string>
#include "core/BaseObject.h"
@@ -53,7 +53,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport QuestDescription : public BaseObject
+ class _QuestsystemExport QuestDescription : public BaseObject
{
// tolua_end
public:
Modified: code/branches/libraries2/src/modules/questsystem/QuestEffect.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestEffect.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestEffect.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _QuestEffect_H__
#define _QuestEffect_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <list>
#include "core/BaseObject.h"
@@ -48,7 +48,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport QuestEffect : public BaseObject
+ class _QuestsystemExport QuestEffect : public BaseObject
{
public:
QuestEffect(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _QuestEffectBeacon_H__
#define _QuestEffectBeacon_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <list>
#include "objects/worldentities/StaticEntity.h"
@@ -78,7 +78,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport QuestEffectBeacon : public StaticEntity
+ class _QuestsystemExport QuestEffectBeacon : public StaticEntity
{
public:
QuestEffectBeacon(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/QuestHint.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestHint.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestHint.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _QuestHint_H__
#define _QuestHint_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <map>
#include "QuestItem.h"
@@ -65,7 +65,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport QuestHint : public QuestItem
+ class _QuestsystemExport QuestHint : public QuestItem
{
public:
Modified: code/branches/libraries2/src/modules/questsystem/QuestItem.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestItem.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestItem.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -36,7 +36,7 @@
#ifndef _QuestItem_H__
#define _QuestItem_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <string>
#include "core/BaseObject.h"
@@ -50,7 +50,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport QuestItem : public BaseObject
+ class _QuestsystemExport QuestItem : public BaseObject
{
public:
Modified: code/branches/libraries2/src/modules/questsystem/QuestListener.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestListener.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestListener.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _QuestListener_H__
#define _QuestListener_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <string>
#include <list>
@@ -71,7 +71,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport QuestListener : public BaseObject
+ class _QuestsystemExport QuestListener : public BaseObject
{
public:
QuestListener(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/QuestManager.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestManager.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestManager.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _QuestManager_H__
#define _QuestManager_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <list>
#include <map>
@@ -74,7 +74,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport QuestManager : public ScopedSingletonQuestManagerGSLevel, public orxonox::OrxonoxClass
+ class _QuestsystemExport QuestManager : public ScopedSingletonQuestManagerGSLevel, public orxonox::OrxonoxClass
{
// tolua_end
friend class ScopedSingleton<QuestManager, ScopeID::GSLevel>;
Modified: code/branches/libraries2/src/modules/questsystem/QuestNotification.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestNotification.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestNotification.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -29,7 +29,7 @@
#ifndef _QuestNotification_H__
#define _QuestNotification_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <string>
#include "notifications/Notification.h"
@@ -42,7 +42,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport QuestNotification : public Notification
+ class _QuestsystemExport QuestNotification : public Notification
{
public:
QuestNotification(BaseObject* creator);
Deleted: code/branches/libraries2/src/modules/questsystem/QuestPrereqs.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestPrereqs.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/QuestPrereqs.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -1,92 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
-*/
-
-#ifndef _QuestsystemPrereqs_H__
-#define _QuestsystemPrereqs_H__
-
-#include "OrxonoxConfig.h"
-
-#include "OrxonoxPrereqs.h"
-
-//-----------------------------------------------------------------------
-// Shared library settings
-//-----------------------------------------------------------------------
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
-# ifdef QUEST_SHARED_BUILD
-# define _QuestExport __declspec(dllexport)
-# else
-# if defined( __MINGW32__ )
-# define _QuestExport
-# else
-# define _QuestExport __declspec(dllimport)
-# endif
-# endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
-# define _QuestExport __attribute__ ((visibility("default")))
-#else
-# define _QuestExport
-#endif
-
-//-----------------------------------------------------------------------
-// Forward declarations
-//-----------------------------------------------------------------------
-
-namespace orxonox
-{
- class AddQuest;
- class AddQuestHint;
- class AddReward;
- class ChangeQuestStatus;
- class CompleteQuest;
- class FailQuest;
- class GlobalQuest;
- class LocalQuest;
- class Quest;
- class QuestDescription;
- class QuestEffect;
- class QuestEffectBeacon;
- class QuestHint;
- class QuestItem;
- class QuestListener;
- class QuestManager;
- class QuestNotification;
- class Rewardable;
-
- class Notification;
- class NotificationListener;
- class NotificationManager;
- class NotificationOverlay;
- class NotificationQueue;
-}
-
-#endif /* _QuestsystemPrereqs_H__ */
Copied: code/branches/libraries2/src/modules/questsystem/QuestsystemPrereqs.h (from rev 5721, code/branches/libraries2/src/modules/questsystem/QuestPrereqs.h)
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestsystemPrereqs.h (rev 0)
+++ code/branches/libraries2/src/modules/questsystem/QuestsystemPrereqs.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -0,0 +1,92 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Contains all the necessary forward declarations for all classes and structs.
+*/
+
+#ifndef _QuestsystemPrereqs_H__
+#define _QuestsystemPrereqs_H__
+
+#include "OrxonoxConfig.h"
+
+#include "OrxonoxPrereqs.h"
+
+//-----------------------------------------------------------------------
+// Shared library settings
+//-----------------------------------------------------------------------
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+# ifdef QUESTSYSTEM_SHARED_BUILD
+# define _QuestsystemExport __declspec(dllexport)
+# else
+# if defined( __MINGW32__ )
+# define _QuestsystemExport
+# else
+# define _QuestsystemExport __declspec(dllimport)
+# endif
+# endif
+#elif defined ( ORXONOX_GCC_VISIBILITY )
+# define _QuestsystemExport __attribute__ ((visibility("default")))
+#else
+# define _QuestsystemExport
+#endif
+
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+ class AddQuest;
+ class AddQuestHint;
+ class AddReward;
+ class ChangeQuestStatus;
+ class CompleteQuest;
+ class FailQuest;
+ class GlobalQuest;
+ class LocalQuest;
+ class Quest;
+ class QuestDescription;
+ class QuestEffect;
+ class QuestEffectBeacon;
+ class QuestHint;
+ class QuestItem;
+ class QuestListener;
+ class QuestManager;
+ class QuestNotification;
+ class Rewardable;
+
+ class Notification;
+ class NotificationListener;
+ class NotificationManager;
+ class NotificationOverlay;
+ class NotificationQueue;
+}
+
+#endif /* _QuestsystemPrereqs_H__ */
Modified: code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt 2009-08-31 15:37:33 UTC (rev 5722)
@@ -1,4 +1,4 @@
-ADD_SOURCE_FILES(QUEST_SRC_FILES
+ADD_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
Notification.cc
NotificationManager.cc
NotificationOverlay.cc
Modified: code/branches/libraries2/src/modules/questsystem/notifications/Notification.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/Notification.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/Notification.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _Notification_H__
#define _Notification_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <string>
#include "core/BaseObject.h"
@@ -48,7 +48,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport Notification : public BaseObject
+ class _QuestsystemExport Notification : public BaseObject
{
public:
Notification(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _NotificationManager_H__
#define _NotificationManager_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <ctime>
#include <map>
@@ -53,7 +53,7 @@
@author
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>;
public:
Modified: code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc 2009-08-31 15:37:33 UTC (rev 5722)
@@ -35,7 +35,7 @@
#include "util/Exception.h"
#include "core/CoreIncludes.h"
-#include "objects/quest/notifications/Notification.h"
+#include "Notification.h"
#include "NotificationQueue.h"
namespace orxonox
Modified: code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -35,7 +35,7 @@
#ifndef _NotificationOverlay_H__
#define _NotificationOverlay_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <string>
#include "overlays/OverlayText.h"
@@ -49,7 +49,7 @@
@author
Damian 'Mozork' Frick
*/
- class _QuestExport NotificationOverlay : public OverlayText
+ class _QuestsystemExport NotificationOverlay : public OverlayText
{
public:
Modified: code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc 2009-08-31 15:37:33 UTC (rev 5722)
@@ -38,7 +38,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "NotificationOverlay.h"
-#include "objects/quest/notifications/NotificationManager.h"
+#include "NotificationManager.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h 2009-08-31 15:37:33 UTC (rev 5722)
@@ -34,7 +34,7 @@
#ifndef _NotificationOueue_H__
#define _NotificationOueue_H__
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
#include <ctime>
#include <map>
@@ -84,7 +84,7 @@
Damian 'Mozork' Frick
*/
- class _QuestExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
+ class _QuestsystemExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
{
public:
Modified: code/branches/libraries2/src/orxonox/objects/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/orxonox/objects/CMakeLists.txt 2009-08-31 15:18:51 UTC (rev 5721)
+++ code/branches/libraries2/src/orxonox/objects/CMakeLists.txt 2009-08-31 15:37:33 UTC (rev 5722)
@@ -15,7 +15,6 @@
ADD_SUBDIRECTORY(infos)
ADD_SUBDIRECTORY(items)
ADD_SUBDIRECTORY(pickup)
-ADD_SUBDIRECTORY(quest)
ADD_SUBDIRECTORY(weaponsystem)
ADD_SUBDIRECTORY(worldentities)
More information about the Orxonox-commit
mailing list