Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2095 for code/trunk


Ignore:
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:
21 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/OrxonoxPrereqs.h

    r2087 r2095  
    8686    class Scene;
    8787
     88    class AddQuest;
     89    class AddQuestHint;
     90    class AddReward;
     91    class ChangeQuestStatus;
     92    class CompleteQuest;
     93    class FailQuest;
     94    class GlobalQuest;
     95    class LocalQuest;
     96    class Quest;
     97    class QuestDescription;
     98    class QuestEffect;
     99    class QuestHint;
     100    class QuestItem;
     101    class QuestManager;
     102    class Rewardable;
     103
    88104    class WorldEntity;
    89105    class PositionableEntity;
  • code/trunk/src/orxonox/objects/quest/AddQuest.h

    r2093 r2095  
    3030#define _AddQuest_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
     
    4547        Damian 'Mozork' Frick
    4648    */
    47     class AddQuest : public ChangeQuestStatus
     49    class _OrxonoxExport AddQuest : public ChangeQuestStatus
    4850    {
    4951        public:
  • code/trunk/src/orxonox/objects/quest/AddQuestHint.cc

    r2093 r2095  
    3030#include "util/Exception.h"
    3131
     32#include "AddQuestHint.h"
    3233#include "QuestManager.h"
    3334#include "QuestItem.h"
    34 #include "AddQuestHint.h"
     35#include "QuestHint.h"
    3536
    3637namespace orxonox {
  • code/trunk/src/orxonox/objects/quest/AddQuestHint.h

    r2093 r2095  
    3030#define _AddQuestHint_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
     
    4446        Damian 'Mozork' Frick
    4547    */
    46     class AddQuestHint : public QuestEffect
     48    class _OrxonoxExport AddQuestHint : public QuestEffect
    4749    {
    4850        public:
  • code/trunk/src/orxonox/objects/quest/AddReward.cc

    r2093 r2095  
    3030
    3131#include "AddReward.h"
     32#include "Rewardable.h"
    3233
    3334namespace orxonox {
  • code/trunk/src/orxonox/objects/quest/AddReward.h

    r2093 r2095  
    3030#define _AddReward_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <list>
    3335
    3436#include "core/XMLPort.h"
    35 #include "Rewardable.h"
    3637#include "QuestEffect.h"
    3738
     
    4647        Damian 'Mozork' Frick
    4748    */
    48     class AddReward : public QuestEffect
     49    class _OrxonoxExport AddReward : public QuestEffect
    4950    {
    5051        public:
  • code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h

    r2093 r2095  
    3030#define _ChangeQuestStatus_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
     
    4547        Damian 'Mozork' Frick
    4648    */
    47     class ChangeQuestStatus : public QuestEffect
     49    class _OrxonoxExport ChangeQuestStatus : public QuestEffect
    4850    {
    4951        public:
  • code/trunk/src/orxonox/objects/quest/CompleteQuest.h

    r2093 r2095  
    3030#define _CompleteQuest_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
     
    4547        Damian 'Mozork' Frick
    4648    */
    47     class CompleteQuest : public ChangeQuestStatus
     49    class _OrxonoxExport CompleteQuest : public ChangeQuestStatus
    4850    {
    4951        public:
  • code/trunk/src/orxonox/objects/quest/FailQuest.h

    r2093 r2095  
    3030#define _FailQuest_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
     
    4547        Damian 'Mozork' Frick
    4648    */
    47     class FailQuest : public ChangeQuestStatus
     49    class _OrxonoxExport FailQuest : public ChangeQuestStatus
    4850    {
    4951        public:
  • code/trunk/src/orxonox/objects/quest/GlobalQuest.h

    r2093 r2095  
    3030#define _GlobalQuest_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <set>
    3335
     
    4648        Damian 'Mozork' Frick
    4749    */
    48     class GlobalQuest : public Quest
     50    class _OrxonoxExport GlobalQuest : public Quest
    4951    {
    5052        public:
  • code/trunk/src/orxonox/objects/quest/LocalQuest.h

    r2093 r2095  
    3030#define _LocalQuest_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <map>
    3335#include <string>
     
    4648        Damian 'Mozork' Frick
    4749    */
    48     class LocalQuest : public Quest
     50    class _OrxonoxExport LocalQuest : public Quest
    4951    {
    5052        public:
  • code/trunk/src/orxonox/objects/quest/Quest.cc

    r2093 r2095  
    3131#include "Quest.h"
    3232#include "QuestManager.h"
     33#include "QuestDescription.h"
     34#include "QuestHint.h"
     35#include "QuestEffect.h"
    3336
    3437namespace orxonox {
  • code/trunk/src/orxonox/objects/quest/Quest.h

    r2093 r2095  
    3030#define _Quest_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <list>
    3335#include <string>
    3436
    3537#include "core/XMLPort.h"
    36 #include "QuestDescription.h"
    3738#include "QuestItem.h"
    38 #include "QuestHint.h"
    39 #include "QuestEffect.h"
    4039
    4140namespace questStatus
     
    6463        Damian 'Mozork' Frick
    6564    */
    66     class Quest : public QuestItem
     65    class _OrxonoxExport Quest : public QuestItem
    6766    {
    6867        public:
  • code/trunk/src/orxonox/objects/quest/QuestDescription.h

    r2093 r2095  
    3030#define _QuestDescription_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
     
    4446        Damian 'Mozork' Frick
    4547    */
    46     class QuestDescription : public BaseObject {
     48    class _OrxonoxExport QuestDescription : public BaseObject {
    4749
    4850        public:
  • code/trunk/src/orxonox/objects/quest/QuestEffect.h

    r2093 r2095  
    3030#define _QuestEffect_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <list>
    3335
     
    4446        Damian 'Mozork' Frick
    4547    */
    46     class QuestEffect : public BaseObject
     48    class _OrxonoxExport QuestEffect : public BaseObject
    4749    {
    4850        public:
  • code/trunk/src/orxonox/objects/quest/QuestHint.h

    r2093 r2095  
    3030#define _QuestHint_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <map>
    3335#include <string>
    3436
    3537#include "core/XMLPort.h"
    36 #include "QuestDescription.h"
    3738#include "QuestItem.h"
    3839
     
    5253
    5354    class Player; //Forward declaration, remove when fully integrated into the objecthirarchy.
    54     class Quest; //To avoid circual includes.
    5555
    5656    /**
     
    6262        Damian 'Mozork' Frick
    6363    */
    64     class QuestHint : public QuestItem
     64    class _OrxonoxExport QuestHint : public QuestItem
    6565    {
    6666
  • code/trunk/src/orxonox/objects/quest/QuestItem.cc

    r2093 r2095  
    3030
    3131#include "QuestItem.h"
     32#include "QuestDescription.h"
    3233
    3334namespace orxonox {
  • code/trunk/src/orxonox/objects/quest/QuestItem.h

    r2093 r2095  
    3030#define _QuestItem_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
    3436#include "core/BaseObject.h"
    3537#include "core/XMLPort.h"
    36 #include "QuestDescription.h"
    3738
    3839namespace orxonox {
     
    4647        Damian 'Mozork' Frick
    4748    */
    48     class QuestItem : public BaseObject
     49    class _OrxonoxExport QuestItem : public BaseObject
    4950    {
    5051
  • code/trunk/src/orxonox/objects/quest/QuestManager.cc

    r2093 r2095  
    3131
    3232#include "QuestManager.h"
     33#include "Quest.h"
     34#include "QuestHint.h"
    3335
    3436namespace orxonox {
  • code/trunk/src/orxonox/objects/quest/QuestManager.h

    r2093 r2095  
    3030#define _QuestManager_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <map>
    3335#include <string>
    3436
    3537#include "core/BaseObject.h"
    36 #include "Quest.h"
    37 #include "QuestHint.h"
    3838
    3939namespace orxonox {
     
    4646        Damian 'Mozork' Frick
    4747    */
    48     class QuestManager : public BaseObject
     48    class _OrxonoxExport QuestManager : public BaseObject
    4949    {
    5050
  • code/trunk/src/orxonox/objects/quest/Rewardable.h

    r2093 r2095  
    3030#define _Rewardable_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include "core/BaseObject.h"
    3335
     
    4244        Damian 'Mozork' Frick
    4345    */
    44     class Rewardable : public BaseObject
     46    class _OrxonoxExport Rewardable : public BaseObject
    4547    {
    4648
Note: See TracChangeset for help on using the changeset viewer.