[Orxonox-commit 648] r3180 - in branches/pch/src/orxonox: gamestates objects/pickup objects/pickup/items objects/quest
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 21:34:07 CEST 2009
Author: rgrieder
Date: 2009-06-15 21:34:07 +0200 (Mon, 15 Jun 2009)
New Revision: 3180
Modified:
branches/pch/src/orxonox/gamestates/GSLevel.cc
branches/pch/src/orxonox/objects/pickup/BaseItem.cc
branches/pch/src/orxonox/objects/pickup/BaseItem.h
branches/pch/src/orxonox/objects/pickup/DroppedItem.cc
branches/pch/src/orxonox/objects/pickup/DroppedItem.h
branches/pch/src/orxonox/objects/pickup/EquipmentItem.cc
branches/pch/src/orxonox/objects/pickup/EquipmentItem.h
branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc
branches/pch/src/orxonox/objects/pickup/ModifierPickup.h
branches/pch/src/orxonox/objects/pickup/ModifierType.h
branches/pch/src/orxonox/objects/pickup/PassiveItem.cc
branches/pch/src/orxonox/objects/pickup/PassiveItem.h
branches/pch/src/orxonox/objects/pickup/PickupCollection.cc
branches/pch/src/orxonox/objects/pickup/PickupCollection.h
branches/pch/src/orxonox/objects/pickup/PickupInventory.cc
branches/pch/src/orxonox/objects/pickup/PickupInventory.h
branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc
branches/pch/src/orxonox/objects/pickup/PickupSpawner.h
branches/pch/src/orxonox/objects/pickup/UsableItem.cc
branches/pch/src/orxonox/objects/pickup/UsableItem.h
branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.cc
branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.h
branches/pch/src/orxonox/objects/pickup/items/HealthUsable.cc
branches/pch/src/orxonox/objects/pickup/items/HealthUsable.h
branches/pch/src/orxonox/objects/pickup/items/Jump.cc
branches/pch/src/orxonox/objects/pickup/items/Jump.h
branches/pch/src/orxonox/objects/quest/AddQuest.cc
branches/pch/src/orxonox/objects/quest/AddQuest.h
branches/pch/src/orxonox/objects/quest/AddQuestHint.cc
branches/pch/src/orxonox/objects/quest/AddQuestHint.h
branches/pch/src/orxonox/objects/quest/AddReward.cc
branches/pch/src/orxonox/objects/quest/AddReward.h
branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.cc
branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.h
branches/pch/src/orxonox/objects/quest/CompleteQuest.cc
branches/pch/src/orxonox/objects/quest/CompleteQuest.h
branches/pch/src/orxonox/objects/quest/FailQuest.cc
branches/pch/src/orxonox/objects/quest/FailQuest.h
branches/pch/src/orxonox/objects/quest/GlobalQuest.cc
branches/pch/src/orxonox/objects/quest/GlobalQuest.h
branches/pch/src/orxonox/objects/quest/LocalQuest.cc
branches/pch/src/orxonox/objects/quest/LocalQuest.h
branches/pch/src/orxonox/objects/quest/Quest.cc
branches/pch/src/orxonox/objects/quest/Quest.h
branches/pch/src/orxonox/objects/quest/QuestDescription.cc
branches/pch/src/orxonox/objects/quest/QuestDescription.h
branches/pch/src/orxonox/objects/quest/QuestEffect.cc
branches/pch/src/orxonox/objects/quest/QuestEffect.h
branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc
branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.h
branches/pch/src/orxonox/objects/quest/QuestHint.cc
branches/pch/src/orxonox/objects/quest/QuestHint.h
branches/pch/src/orxonox/objects/quest/QuestItem.cc
branches/pch/src/orxonox/objects/quest/QuestItem.h
branches/pch/src/orxonox/objects/quest/QuestListener.cc
branches/pch/src/orxonox/objects/quest/QuestListener.h
branches/pch/src/orxonox/objects/quest/QuestManager.cc
branches/pch/src/orxonox/objects/quest/QuestManager.h
branches/pch/src/orxonox/objects/quest/QuestNotification.cc
branches/pch/src/orxonox/objects/quest/QuestNotification.h
branches/pch/src/orxonox/objects/quest/Rewardable.cc
branches/pch/src/orxonox/objects/quest/Rewardable.h
Log:
Cleanup in pickup and quest (almost only cleaned the header file sections).
Modified: branches/pch/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,8 +37,10 @@
#include "core/CommandLine.h"
#include "core/ConsoleCommand.h"
#include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
#include "core/Game.h"
#include "core/GameMode.h"
+#include "core/Core.h"
#include "core/Loader.h"
#include "core/ObjectList.h"
#include "core/XMLFile.h"
Modified: branches/pch/src/orxonox/objects/pickup/BaseItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/BaseItem.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/BaseItem.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -33,8 +33,7 @@
#include "BaseItem.h"
-#include "PickupCollection.h"
-
+#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "objects/worldentities/pawns/Pawn.h"
@@ -54,7 +53,7 @@
this->setGUIImage("");
this->setGUIText("");
}
- //! Deconstructor.
+ //! Destructor.
BaseItem::~BaseItem()
{
}
@@ -104,5 +103,8 @@
return true;
}
- const std::string& BaseItem::getGUIText() const { return this->guiText_; }
+ const std::string& BaseItem::getGUIText() const
+ {
+ return this->guiText_;
+ }
}
Modified: branches/pch/src/orxonox/objects/pickup/BaseItem.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/BaseItem.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/BaseItem.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -36,6 +36,7 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include "core/BaseObject.h"
// tolua_begin
Modified: branches/pch/src/orxonox/objects/pickup/DroppedItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/DroppedItem.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/DroppedItem.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -28,13 +28,16 @@
#include "DroppedItem.h"
+#include "util/Debug.h"
+#include "util/Math.h"
+#include "core/CoreIncludes.h"
+#include "core/Executor.h"
+#include "core/ObjectList.h"
#include "BaseItem.h"
+#include "objects/worldentities/Billboard.h"
+#include "objects/worldentities/Model.h"
#include "objects/worldentities/pawns/Pawn.h"
-#include "objects/worldentities/Model.h"
-#include "objects/worldentities/Billboard.h"
-#include "core/CoreIncludes.h"
-
namespace orxonox
{
CreateFactory(DroppedItem);
Modified: branches/pch/src/orxonox/objects/pickup/DroppedItem.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/DroppedItem.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/DroppedItem.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -28,7 +28,7 @@
/**
@file
- @brief Definition of BaseItem (base-class for items/pickups).
+ @brief Definition of DroppedItem
*/
#ifndef _DroppedItem_H__
@@ -36,9 +36,9 @@
#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
#include "interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/pickup/EquipmentItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/EquipmentItem.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/EquipmentItem.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,7 +32,6 @@
*/
#include "EquipmentItem.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
@@ -45,8 +44,4 @@
{
RegisterObject(EquipmentItem);
}
- //! Deconstructor.
- EquipmentItem::~EquipmentItem()
- {
- }
}
Modified: branches/pch/src/orxonox/objects/pickup/EquipmentItem.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/EquipmentItem.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/EquipmentItem.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,7 +37,6 @@
#include "OrxonoxPrereqs.h"
#include "BaseItem.h"
-
namespace orxonox
{
/**
@@ -48,7 +47,7 @@
{
public:
EquipmentItem(BaseObject* creator);
- virtual ~EquipmentItem();
+ virtual ~EquipmentItem() {}
};
}
Modified: branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,11 +32,10 @@
*/
#include "ModifierPickup.h"
-#include "PickupCollection.h"
+#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-
#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/pickup/ModifierPickup.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/ModifierPickup.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/ModifierPickup.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,13 +34,14 @@
#ifndef _ModifierPickup_H__
#define _ModifierPickup_H__
+#include "OrxonoxPrereqs.h"
+
#include <climits>
+#include <map>
-#include "OrxonoxPrereqs.h"
-
+#include "orxonox/tools/Timer.h"
+#include "ModifierType.h"
#include "PassiveItem.h"
-#include "ModifierType.h"
-#include "orxonox/tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/pickup/ModifierType.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/ModifierType.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/ModifierType.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,6 +34,8 @@
#ifndef _ModifierType_H__
#define _ModifierType_H__
+#include "OrxonoxPrereqs.h"
+
namespace orxonox
{
namespace ModifierType
Modified: branches/pch/src/orxonox/objects/pickup/PassiveItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PassiveItem.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/PassiveItem.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -27,7 +27,6 @@
*/
#include "PassiveItem.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
@@ -40,8 +39,4 @@
{
RegisterObject(PassiveItem);
}
- //! Deconstructor.
- PassiveItem::~PassiveItem()
- {
- }
}
Modified: branches/pch/src/orxonox/objects/pickup/PassiveItem.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PassiveItem.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/PassiveItem.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,7 +35,6 @@
#define _PassiveItem_H__
#include "OrxonoxPrereqs.h"
-
#include "BaseItem.h"
namespace orxonox
@@ -48,7 +47,7 @@
{
public:
PassiveItem(BaseObject* creator);
- virtual ~PassiveItem();
+ virtual ~PassiveItem() {}
};
}
Modified: branches/pch/src/orxonox/objects/pickup/PickupCollection.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PickupCollection.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/PickupCollection.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -33,13 +33,11 @@
#include "PickupCollection.h"
-#include "BaseItem.h"
+#include "core/CoreIncludes.h"
#include "EquipmentItem.h"
#include "PassiveItem.h"
#include "UsableItem.h"
-#include "core/CoreIncludes.h"
-
namespace orxonox
{
typedef std::pair<std::multimap<std::string, BaseItem*>::iterator, std::multimap<std::string, BaseItem*>::iterator> item_range;
Modified: branches/pch/src/orxonox/objects/pickup/PickupCollection.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PickupCollection.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/PickupCollection.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -36,12 +36,11 @@
#include "OrxonoxPrereqs.h"
-#include <map>
#include <deque>
+#include <map>
#include <string>
#include "util/Math.h"
-
#include "ModifierType.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/pickup/PickupInventory.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PickupInventory.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/PickupInventory.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -28,24 +28,24 @@
#include "PickupInventory.h"
-#include "EquipmentItem.h"
-#include "PassiveItem.h"
-#include "UsableItem.h"
+#include <CEGUIImage.h>
+#include <CEGUIImageset.h>
+#include <CEGUIImagesetManager.h>
+#include <CEGUIWindow.h>
+#include <CEGUIWindowManager.h>
+#include <elements/CEGUITabControl.h>
#include "core/ConsoleCommand.h"
#include "core/input/InputManager.h"
-
#include "gui/GUIManager.h"
#include "objects/controllers/HumanController.h"
#include "objects/worldentities/pawns/Pawn.h"
-#include <CEGUIImage.h>
-#include <CEGUIImageset.h>
-#include <CEGUIImagesetManager.h>
-#include <CEGUIWindow.h>
-#include <CEGUIWindowManager.h>
-#include <elements/CEGUITabControl.h>
+#include "EquipmentItem.h"
+#include "PassiveItem.h"
+#include "UsableItem.h"
+
namespace orxonox
{
SetConsoleCommandShortcut(PickupInventory, toggleInventory);
Modified: branches/pch/src/orxonox/objects/pickup/PickupInventory.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PickupInventory.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/PickupInventory.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -36,10 +36,9 @@
#include "OrxonoxPrereqs.h"
+#include <CEGUIForwardRefs.h>
#include "core/BaseObject.h"
-namespace CEGUI { class Window; class WindowManager; class Image; }
-
// tolua_begin
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,16 +32,18 @@
*/
#include "PickupSpawner.h"
+
#include "BaseItem.h"
-#include "PickupInventory.h" // HACK; Only for hack, remove later
-#include "gui/GUIManager.h" // HACK; see above
#include "core/CoreIncludes.h"
+#include "core/ObjectList.h"
+#include "core/Template.h"
#include "core/XMLPort.h"
-#include "core/Template.h"
-
+#include "gui/GUIManager.h" // HACK; see below
#include "objects/worldentities/pawns/Pawn.h"
+#include "PickupInventory.h" // HACK; Only for hack, remove later
+
namespace orxonox
{
const float PickupSpawner::bounceSpeed_s = 6.0f;
Modified: branches/pch/src/orxonox/objects/pickup/PickupSpawner.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PickupSpawner.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/PickupSpawner.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -36,9 +36,10 @@
#include "OrxonoxPrereqs.h"
+#include <string>
+#include "tools/Timer.h"
#include "interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/pickup/UsableItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/UsableItem.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/UsableItem.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,7 +32,6 @@
*/
#include "UsableItem.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
@@ -45,8 +44,4 @@
{
RegisterObject(UsableItem);
}
- //! Deconstructor.
- UsableItem::~UsableItem()
- {
- }
}
Modified: branches/pch/src/orxonox/objects/pickup/UsableItem.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/UsableItem.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/UsableItem.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,7 +35,6 @@
#define _UsableItem_H__
#include "OrxonoxPrereqs.h"
-
#include "BaseItem.h"
namespace orxonox
@@ -48,7 +47,7 @@
{
public:
UsableItem(BaseObject* creator);
- virtual ~UsableItem();
+ virtual ~UsableItem() { }
/**
@brief Method invoked when the item is being used.
Modified: branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -33,10 +33,9 @@
#include "HealthImmediate.h"
-#include "objects/worldentities/pawns/Pawn.h"
-
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,7 +35,6 @@
#define _HealthImmediate_H__
#include "OrxonoxPrereqs.h"
-
#include "objects/pickup/PassiveItem.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/pickup/items/HealthUsable.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/items/HealthUsable.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/items/HealthUsable.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,12 +32,12 @@
*/
#include "HealthUsable.h"
-#include "objects/pickup/DroppedItem.h"
-#include "objects/worldentities/pawns/Pawn.h"
-
+#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "objects/pickup/DroppedItem.h"
+#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/pickup/items/HealthUsable.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/items/HealthUsable.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/items/HealthUsable.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,12 +34,10 @@
#ifndef _HealthUsable_H__
#define _HealthUsable_H__
-#include <climits>
-
#include "OrxonoxPrereqs.h"
+#include <climits>
#include "objects/pickup/UsableItem.h"
-#include "util/Math.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/pickup/items/Jump.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/items/Jump.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/items/Jump.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,12 +32,11 @@
*/
#include "Jump.h"
-#include "objects/pickup/DroppedItem.h"
-#include "objects/worldentities/pawns/Pawn.h"
-
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "objects/pickup/DroppedItem.h"
+#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/pickup/items/Jump.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/items/Jump.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/pickup/items/Jump.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -38,8 +38,9 @@
#include "OrxonoxPrereqs.h"
+#include <climits>
+#include "util/Math.h"
#include "objects/pickup/UsableItem.h"
-#include "util/Math.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/quest/AddQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuest.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/AddQuest.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -33,13 +33,10 @@
#include "AddQuest.h"
-#include <string>
-
+#include "util/Debug.h"
+#include "util/Exception.h"
#include "core/CoreIncludes.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
#include "QuestManager.h"
-#include "QuestDescription.h"
#include "Quest.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/AddQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuest.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/AddQuest.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,8 +35,6 @@
#define _AddQuest_H__
#include "OrxonoxPrereqs.h"
-
-#include "core/XMLPort.h"
#include "ChangeQuestStatus.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/AddQuestHint.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuestHint.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/AddQuestHint.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -33,9 +33,9 @@
#include "AddQuestHint.h"
+#include "util/Exception.h"
#include "core/CoreIncludes.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
+#include "core/XMLPort.h"
#include "QuestManager.h"
#include "QuestItem.h"
#include "QuestHint.h"
Modified: branches/pch/src/orxonox/objects/quest/AddQuestHint.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuestHint.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/AddQuestHint.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,7 +37,6 @@
#include "OrxonoxPrereqs.h"
#include <string>
-
#include "QuestEffect.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/AddReward.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddReward.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/AddReward.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -33,9 +33,9 @@
#include "AddReward.h"
+#include "util/Debug.h"
#include "core/CoreIncludes.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
+#include "core/XMLPort.h"
#include "Rewardable.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/AddReward.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddReward.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/AddReward.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,8 +37,6 @@
#include "OrxonoxPrereqs.h"
#include <list>
-
-#include "core/XMLPort.h"
#include "QuestEffect.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,7 +34,7 @@
#include "ChangeQuestStatus.h"
#include "core/CoreIncludes.h"
-
+#include "core/XMLPort.h"
#include "QuestItem.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,8 +37,6 @@
#include "OrxonoxPrereqs.h"
#include <string>
-
-#include "core/XMLPort.h"
#include "QuestEffect.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/CompleteQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/CompleteQuest.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/CompleteQuest.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,8 +34,7 @@
#include "CompleteQuest.h"
#include "core/CoreIncludes.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
+#include "core/XMLPort.h"
#include "QuestManager.h"
#include "Quest.h"
Modified: branches/pch/src/orxonox/objects/quest/CompleteQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/CompleteQuest.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/CompleteQuest.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,8 +35,6 @@
#define _CompleteQuest_H__
#include "OrxonoxPrereqs.h"
-
-#include "core/XMLPort.h"
#include "ChangeQuestStatus.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/FailQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/FailQuest.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/FailQuest.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,8 +34,7 @@
#include "FailQuest.h"
#include "core/CoreIncludes.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
+#include "core/XMLPort.h"
#include "QuestManager.h"
#include "Quest.h"
Modified: branches/pch/src/orxonox/objects/quest/FailQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/FailQuest.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/FailQuest.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,8 +35,6 @@
#define _FailQuest_H__
#include "OrxonoxPrereqs.h"
-
-#include "core/XMLPort.h"
#include "ChangeQuestStatus.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/GlobalQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/GlobalQuest.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/GlobalQuest.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -33,10 +33,8 @@
#include "GlobalQuest.h"
-#include "orxonox/objects/infos/PlayerInfo.h"
#include "core/CoreIncludes.h"
-#include "core/Super.h"
-
+#include "core/XMLPort.h"
#include "QuestEffect.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/GlobalQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/GlobalQuest.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/GlobalQuest.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -36,10 +36,8 @@
#include "OrxonoxPrereqs.h"
-#include <set>
#include <list>
-
-#include "core/XMLPort.h"
+#include <set>
#include "Quest.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/LocalQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/LocalQuest.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/LocalQuest.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,9 +34,7 @@
#include "LocalQuest.h"
#include "core/CoreIncludes.h"
-#include "core/Super.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
+#include "core/XMLPort.h"
#include "QuestEffect.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/LocalQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/LocalQuest.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/LocalQuest.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,8 +37,6 @@
#include "OrxonoxPrereqs.h"
#include <map>
-
-#include "core/XMLPort.h"
#include "Quest.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/Quest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/Quest.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/Quest.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,8 +34,7 @@
#include "Quest.h"
#include "core/CoreIncludes.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
+#include "core/XMLPort.h"
#include "QuestManager.h"
#include "QuestDescription.h"
#include "QuestHint.h"
Modified: branches/pch/src/orxonox/objects/quest/Quest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/Quest.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/Quest.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -38,9 +38,6 @@
#include "OrxonoxPrereqs.h"
#include <list>
-
-#include "core/XMLPort.h"
-
#include "QuestItem.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/QuestDescription.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestDescription.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestDescription.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,6 +35,7 @@
#include "QuestDescription.h"
#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
#include "QuestNotification.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/QuestDescription.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestDescription.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestDescription.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,9 +37,7 @@
#include "OrxonoxPrereqs.h"
#include <string>
-
#include "core/BaseObject.h"
-#include "core/XMLPort.h"
// tolua_begin
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/QuestEffect.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffect.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestEffect.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,11 +32,8 @@
*/
#include "QuestEffect.h"
-
#include "core/CoreIncludes.h"
-#include "orxonox/objects/infos/PlayerInfo.h"
-
namespace orxonox
{
/**
Modified: branches/pch/src/orxonox/objects/quest/QuestEffect.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffect.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestEffect.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,7 +37,6 @@
#include "OrxonoxPrereqs.h"
#include <list>
-
#include "core/BaseObject.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,10 +35,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "core/Event.h"
#include "core/EventIncludes.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
#include "orxonox/objects/worldentities/pawns/Pawn.h"
#include "orxonox/objects/worldentities/triggers/PlayerTrigger.h"
#include "QuestEffect.h"
Modified: branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -36,6 +36,7 @@
#include "OrxonoxPrereqs.h"
+#include <list>
#include "orxonox/objects/worldentities/StaticEntity.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/QuestHint.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestHint.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestHint.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,8 +34,7 @@
#include "QuestHint.h"
#include "core/CoreIncludes.h"
-
-#include "orxonox/objects/infos/PlayerInfo.h"
+#include "core/XMLPort.h"
#include "QuestManager.h"
#include "QuestDescription.h"
#include "Quest.h"
Modified: branches/pch/src/orxonox/objects/quest/QuestHint.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestHint.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestHint.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -37,8 +37,6 @@
#include "OrxonoxPrereqs.h"
#include <map>
-
-#include "core/XMLPort.h"
#include "QuestItem.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/QuestItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestItem.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestItem.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -34,7 +34,7 @@
#include "QuestItem.h"
#include "core/CoreIncludes.h"
-
+#include "core/XMLPort.h"
#include "QuestDescription.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/QuestItem.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestItem.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestItem.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -39,9 +39,7 @@
#include "OrxonoxPrereqs.h"
#include <string>
-
#include "core/BaseObject.h"
-#include "core/XMLPort.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/quest/QuestListener.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestListener.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestListener.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,7 +35,6 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-
#include "Quest.h"
#include "QuestManager.h"
@@ -189,6 +188,17 @@
/**
@brief
+ Get the questId of the Quest the QuestListener reacts to.
+ @return
+ Returns the questId of the Quest the QuestListener reacts to.
+ */
+ const std::string & QuestListener::getQuestId(void)
+ {
+ return this->quest_->getId();
+ }
+
+ /**
+ @brief
Executes the QuestListener, resp. fires an Event.
@return
Returns true if successful.
Modified: branches/pch/src/orxonox/objects/quest/QuestListener.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestListener.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestListener.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -38,11 +38,8 @@
#include <string>
#include <list>
-
#include "core/BaseObject.h"
-#include "Quest.h"
-
namespace orxonox
{
namespace questListenerMode
@@ -91,13 +88,7 @@
std::string getMode(void); //!< Get the mode of the QuestListener.
- /**
- @brief Get the questId of the Quest the QuestListener reacts to.
- @return Returns the questId of the Quest the QuestListener reacts to.
- */
- inline const std::string & getQuestId(void)
- { return this->quest_->getId(); }
-
+ const std::string & getQuestId(void);
bool execute(void); //!< Executes the QuestListener, resp. fires an Event.
private:
Modified: branches/pch/src/orxonox/objects/quest/QuestManager.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestManager.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestManager.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -33,14 +33,16 @@
#include "QuestManager.h"
+#include "util/Exception.h"
#include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
-#include "core/input/InputManager.h"
+#include "gui/GUIManager.h"
-#include "gui/GUIManager.h"
#include "objects/infos/PlayerInfo.h"
+#include "objects/infos/PlayerInfo.h"
+#include "overlays/GUIOverlay.h"
#include "Quest.h"
#include "QuestHint.h"
+#include "QuestItem.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/quest/QuestManager.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestManager.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestManager.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -36,13 +36,10 @@
#include "OrxonoxPrereqs.h"
-#include <map>
#include <list>
+#include <map>
#include <string>
-
#include "core/OrxonoxClass.h"
-#include "orxonox/objects/infos/PlayerInfo.h"
-#include "overlays/GUIOverlay.h"
// tolua_begin
namespace orxonox
Modified: branches/pch/src/orxonox/objects/quest/QuestNotification.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestNotification.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestNotification.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -27,11 +27,8 @@
*/
#include "QuestNotification.h"
-
#include "core/CoreIncludes.h"
-#include "orxonox/overlays/notifications/Notification.h"
-
namespace orxonox {
const std::string QuestNotification::SENDER = "questsystem";
Modified: branches/pch/src/orxonox/objects/quest/QuestNotification.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestNotification.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/QuestNotification.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,9 +32,8 @@
#include "OrxonoxPrereqs.h"
#include <string>
+#include "overlays/notifications/Notification.h"
-#include "orxonox/overlays/notifications/Notification.h"
-
namespace orxonox {
/**
Modified: branches/pch/src/orxonox/objects/quest/Rewardable.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/Rewardable.cc 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/Rewardable.cc 2009-06-15 19:34:07 UTC (rev 3180)
@@ -32,7 +32,6 @@
*/
#include "Rewardable.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
@@ -41,18 +40,8 @@
@brief
Constructor. Registers the object.
*/
- Rewardable::Rewardable(BaseObject* creator) : BaseObject(creator)
+ Rewardable::Rewardable()
{
RegisterObject(Rewardable);
}
-
- /**
- @brief
- Destructor,
- */
- Rewardable::~Rewardable()
- {
- }
-
-
}
Modified: branches/pch/src/orxonox/objects/quest/Rewardable.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/Rewardable.h 2009-06-15 18:20:14 UTC (rev 3179)
+++ branches/pch/src/orxonox/objects/quest/Rewardable.h 2009-06-15 19:34:07 UTC (rev 3180)
@@ -35,9 +35,8 @@
#define _Rewardable_H__
#include "OrxonoxPrereqs.h"
+#include "core/OrxonoxClass.h"
-#include "core/BaseObject.h"
-
namespace orxonox
{
/**
@@ -48,11 +47,11 @@
@author
Damian 'Mozork' Frick
*/
- class _OrxonoxExport Rewardable : public BaseObject
+ class _OrxonoxExport Rewardable : public OrxonoxClass
{
public:
- Rewardable(BaseObject* creator);
- virtual ~Rewardable();
+ Rewardable();
+ virtual ~Rewardable() {}
/**
@brief
@@ -66,7 +65,6 @@
virtual bool reward(PlayerInfo* player) = 0;
};
-
}
#endif /* _Rewardable_H__ */
More information about the Orxonox-commit
mailing list