Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5722


Ignore:
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
Files:
27 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r5720 r5722  
    2222ADD_SUBDIRECTORY(gamestates)
    2323ADD_SUBDIRECTORY(overlays)
     24ADD_SUBDIRECTORY(questsystem)

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

    r5693 r5722  
    3535#define _AddQuest_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838#include "ChangeQuestStatus.h"
    3939
    … …  
    5050        Damian 'Mozork' Frick
    5151    */
    52     class _QuestExport AddQuest : public ChangeQuestStatus
     52    class _QuestsystemExport AddQuest : public ChangeQuestStatus
    5353    {
    5454        public:

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

    r5693 r5722  
    3535#define _AddQuestHint_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <string>
    … …  
    5252        Damian 'Mozork' Frick
    5353    */
    54     class _QuestExport AddQuestHint : public QuestEffect
     54    class _QuestsystemExport AddQuestHint : public QuestEffect
    5555    {
    5656        public:

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

    r5693 r5722  
    3535#define _AddReward_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <list>
    … …  
    5656        Damian 'Mozork' Frick
    5757    */
    58     class _QuestExport AddReward : public QuestEffect
     58    class _QuestsystemExport AddReward : public QuestEffect
    5959    {
    6060        public:

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

    r5693 r5722  
    1 SET_SOURCE_FILES(QUEST_SRC_FILES
     1SET_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
    22  AddQuest.cc
    33  AddQuestHint.cc
    … …  
    2121ADD_SUBDIRECTORY(notifications)
    2222
    23 # add the parent directory for tolua (TODO: remove this if the quest module is moved somewhere else)
    24 INCLUDE_DIRECTORIES(..)
    25 
    26 ORXONOX_ADD_LIBRARY(quest
     23ORXONOX_ADD_LIBRARY(questsystem
    2724  MODULE
    2825  TOLUA_FILES
    … …  
    3027    QuestManager.h
    3128  DEFINE_SYMBOL
    32     "QUEST_SHARED_BUILD"
     29    "QUESTSYSTEM_SHARED_BUILD"
    3330  LINK_LIBRARIES
    3431    orxonox
    3532    overlays
    36   SOURCE_FILES ${QUEST_SRC_FILES}
     33  SOURCE_FILES ${QUESTSYSTEM_SRC_FILES}
    3734)

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

    r5693 r5722  
    3535#define _ChangeQuestStatus_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <string>
    … …  
    4848        Damian 'Mozork' Frick
    4949    */
    50     class _QuestExport ChangeQuestStatus : public QuestEffect
     50    class _QuestsystemExport ChangeQuestStatus : public QuestEffect
    5151    {
    5252        public:

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

    r5693 r5722  
    3535#define _CompleteQuest_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838#include "ChangeQuestStatus.h"
    3939
    … …  
    5050        Damian 'Mozork' Frick
    5151    */
    52     class _QuestExport CompleteQuest : public ChangeQuestStatus
     52    class _QuestsystemExport CompleteQuest : public ChangeQuestStatus
    5353    {
    5454        public:

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

    r5693 r5722  
    3535#define _FailQuest_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838#include "ChangeQuestStatus.h"
    3939
    … …  
    5050        Damian 'Mozork' Frick
    5151    */
    52     class _QuestExport FailQuest : public ChangeQuestStatus
     52    class _QuestsystemExport FailQuest : public ChangeQuestStatus
    5353    {
    5454        public:

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

    r5693 r5722  
    3535#define _GlobalQuest_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <list>
    … …  
    8181        Damian 'Mozork' Frick
    8282    */
    83     class _QuestExport GlobalQuest : public Quest
     83    class _QuestsystemExport GlobalQuest : public Quest
    8484    {
    8585        public:

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

    r5693 r5722  
    3535#define _LocalQuest_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <map>
    … …  
    7575        Damian 'Mozork' Frick
    7676    */
    77     class _QuestExport LocalQuest : public Quest
     77    class _QuestsystemExport LocalQuest : public Quest
    7878    {
    7979        public:

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

    r5693 r5722  
    3636#define _Quest_H__
    3737
    38 #include "objects/quest/QuestPrereqs.h"
     38#include "questsystem/QuestsystemPrereqs.h"
    3939
    4040#include <list>
    … …  
    6767        Damian 'Mozork' Frick
    6868    */
    69     class _QuestExport Quest : public QuestItem
     69    class _QuestsystemExport Quest : public QuestItem
    7070    {
    7171        public:

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

    r5693 r5722  
    3535#define _QuestDescription_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <string>
    … …  
    5454        Damian 'Mozork' Frick
    5555    */
    56     class _QuestExport QuestDescription : public BaseObject
     56    class _QuestsystemExport QuestDescription : public BaseObject
    5757    {
    5858// tolua_end

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

    r5693 r5722  
    3535#define _QuestEffect_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <list>
    … …  
    4949        Damian 'Mozork' Frick
    5050    */
    51     class _QuestExport QuestEffect : public BaseObject
     51    class _QuestsystemExport QuestEffect : public BaseObject
    5252    {
    5353        public:

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

    r5720 r5722  
    3535#define _QuestEffectBeacon_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <list>
    … …  
    7979        Damian 'Mozork' Frick
    8080    */
    81     class _QuestExport QuestEffectBeacon : public StaticEntity
     81    class _QuestsystemExport QuestEffectBeacon : public StaticEntity
    8282    {
    8383        public:

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

    r5693 r5722  
    3535#define _QuestHint_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <map>
    … …  
    6666        Damian 'Mozork' Frick
    6767    */
    68     class _QuestExport QuestHint : public QuestItem
     68    class _QuestsystemExport QuestHint : public QuestItem
    6969    {
    7070

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

    r5693 r5722  
    3737#define _QuestItem_H__
    3838
    39 #include "objects/quest/QuestPrereqs.h"
     39#include "questsystem/QuestsystemPrereqs.h"
    4040
    4141#include <string>
    … …  
    5151        Damian 'Mozork' Frick
    5252    */
    53     class _QuestExport QuestItem : public BaseObject
     53    class _QuestsystemExport QuestItem : public BaseObject
    5454    {
    5555

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

    r5693 r5722  
    3535#define _QuestListener_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <string>
    … …  
    7272    Damian 'Mozork' Frick
    7373    */
    74     class _QuestExport QuestListener : public BaseObject
     74    class _QuestsystemExport QuestListener : public BaseObject
    7575    {
    7676    public:

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

    r5693 r5722  
    3535#define _QuestManager_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <list>
    … …  
    7575        Damian 'Mozork' Frick
    7676    */
    77     class _QuestExport QuestManager : public ScopedSingletonQuestManagerGSLevel, public orxonox::OrxonoxClass
     77    class _QuestsystemExport QuestManager : public ScopedSingletonQuestManagerGSLevel, public orxonox::OrxonoxClass
    7878    {
    7979// tolua_end

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

    r5693 r5722  
    3030#define _QuestNotification_H__
    3131
    32 #include "objects/quest/QuestPrereqs.h"
     32#include "questsystem/QuestsystemPrereqs.h"
    3333
    3434#include <string>
    … …  
    4343        Damian 'Mozork' Frick
    4444    */
    45     class _QuestExport QuestNotification : public Notification
     45    class _QuestsystemExport QuestNotification : public Notification
    4646    {
    4747        public:

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

    r5721 r5722  
    4343//-----------------------------------------------------------------------
    4444#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
    45 #  ifdef QUEST_SHARED_BUILD
    46 #    define _QuestExport __declspec(dllexport)
     45#  ifdef QUESTSYSTEM_SHARED_BUILD
     46#    define _QuestsystemExport __declspec(dllexport)
    4747#  else
    4848#    if defined( __MINGW32__ )
    49 #      define _QuestExport
     49#      define _QuestsystemExport
    5050#    else
    51 #      define _QuestExport __declspec(dllimport)
     51#      define _QuestsystemExport __declspec(dllimport)
    5252#    endif
    5353#  endif
    5454#elif defined ( ORXONOX_GCC_VISIBILITY )
    55 #  define _QuestExport  __attribute__ ((visibility("default")))
     55#  define _QuestsystemExport  __attribute__ ((visibility("default")))
    5656#else
    57 #  define _QuestExport
     57#  define _QuestsystemExport
    5858#endif
    5959

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

    r5693 r5722  
    1 ADD_SOURCE_FILES(QUEST_SRC_FILES
     1ADD_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
    22  Notification.cc
    33  NotificationManager.cc

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

    r5693 r5722  
    3535#define _Notification_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <string>
    … …  
    4949        Damian 'Mozork' Frick
    5050    */
    51     class _QuestExport Notification : public BaseObject
     51    class _QuestsystemExport Notification : public BaseObject
    5252    {
    5353        public:

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

    r5693 r5722  
    3535#define _NotificationManager_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <ctime>
    … …  
    5454        Damian 'Mozork' Frick
    5555    */
    56     class _QuestExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::GSLevel>, public OrxonoxClass
     56    class _QuestsystemExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::GSLevel>, public OrxonoxClass
    5757    {
    5858            friend class ScopedSingleton<NotificationManager, ScopeID::GSLevel>;

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

    r5693 r5722  
    3636#include "util/Exception.h"
    3737#include "core/CoreIncludes.h"
    38 #include "objects/quest/notifications/Notification.h"
     38#include "Notification.h"
    3939#include "NotificationQueue.h"
    4040

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

    r5720 r5722  
    3636#define _NotificationOverlay_H__
    3737
    38 #include "objects/quest/QuestPrereqs.h"
     38#include "questsystem/QuestsystemPrereqs.h"
    3939
    4040#include <string>
    … …  
    5050        Damian 'Mozork' Frick
    5151    */
    52     class _QuestExport NotificationOverlay : public OverlayText
     52    class _QuestsystemExport NotificationOverlay : public OverlayText
    5353    {
    5454

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

    r5693 r5722  
    3939#include "core/XMLPort.h"
    4040#include "NotificationOverlay.h"
    41 #include "objects/quest/notifications/NotificationManager.h"
     41#include "NotificationManager.h"
    4242
    4343namespace orxonox

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

    r5693 r5722  
    3535#define _NotificationOueue_H__
    3636
    37 #include "objects/quest/QuestPrereqs.h"
     37#include "questsystem/QuestsystemPrereqs.h"
    3838
    3939#include <ctime>
    … …  
    8585    */
    8686
    87     class _QuestExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
     87    class _QuestsystemExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
    8888    {
    8989

  • code/branches/libraries2/src/orxonox/objects/CMakeLists.txt

    r3196 r5722  
    1616ADD_SUBDIRECTORY(items)
    1717ADD_SUBDIRECTORY(pickup)
    18 ADD_SUBDIRECTORY(quest)
    1918ADD_SUBDIRECTORY(weaponsystem)
    2019ADD_SUBDIRECTORY(worldentities)
Note: See TracChangeset for help on using the changeset viewer.