Changeset 3180 for code/branches/pch/src/orxonox/objects/pickup

Timestamp:

Jun 15, 2009, 9:34:07 PM (16 years ago)

Author:

rgrieder

Message:

Cleanup in pickup and quest (almost only cleaned the header file sections).

Location:

code/branches/pch/src/orxonox/objects/pickup

Files:

• BaseItem.cc (modified) (3 diffs)
• BaseItem.h (modified) (1 diff)
• DroppedItem.cc (modified) (1 diff)
• DroppedItem.h (modified) (2 diffs)
• EquipmentItem.cc (modified) (2 diffs)
• EquipmentItem.h (modified) (2 diffs)
• ModifierPickup.cc (modified) (1 diff)
• ModifierPickup.h (modified) (1 diff)
• ModifierType.h (modified) (1 diff)
• PassiveItem.cc (modified) (2 diffs)
• PassiveItem.h (modified) (2 diffs)
• PickupCollection.cc (modified) (1 diff)
• PickupCollection.h (modified) (1 diff)
• PickupInventory.cc (modified) (2 diffs)
• PickupInventory.h (modified) (1 diff)
• PickupSpawner.cc (modified) (1 diff)
• PickupSpawner.h (modified) (1 diff)
• UsableItem.cc (modified) (2 diffs)
• UsableItem.h (modified) (2 diffs)
• items/HealthImmediate.cc (modified) (1 diff)
• items/HealthImmediate.h (modified) (1 diff)
• items/HealthUsable.cc (modified) (1 diff)
• items/HealthUsable.h (modified) (1 diff)
• items/Jump.cc (modified) (1 diff)
• items/Jump.h (modified) (1 diff)

code/branches/pch/src/orxonox/objects/pickup/BaseItem.cc

@@ -34 +34 @@
 #include "BaseItem.h"
 
-#include "PickupCollection.h"
-
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -55 +54 @@
         this->setGUIText("");
     }
-    //! Deconstructor.
+    //! Destructor.
     BaseItem::~BaseItem()
     {
@@ -105 +104 @@
     }
 
-    const std::string& BaseItem::getGUIText() const { return this->guiText_; }
+    const std::string& BaseItem::getGUIText() const
+    {
+        return this->guiText_;
+    }
 }

code/branches/pch/src/orxonox/objects/pickup/BaseItem.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "core/BaseObject.h"
 

code/branches/pch/src/orxonox/objects/pickup/DroppedItem.cc

@@ -29 +29 @@
 #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

code/branches/pch/src/orxonox/objects/pickup/DroppedItem.h

@@ -29 +29 @@
 /**
     @file
-    @brief Definition of BaseItem (base-class for items/pickups).
+    @brief Definition of DroppedItem
 */
 
@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
+#include "tools/Timer.h"
 #include "interfaces/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/pickup/EquipmentItem.cc

@@ -33 +33 @@
 
 #include "EquipmentItem.h"
-
 #include "core/CoreIncludes.h"
 
@@ -46 +45 @@
         RegisterObject(EquipmentItem);
     }
-    //! Deconstructor.
-    EquipmentItem::~EquipmentItem()
-    {
-    }
 }

code/branches/pch/src/orxonox/objects/pickup/EquipmentItem.h

@@ -38 +38 @@
 
 #include "BaseItem.h"
-
 namespace orxonox
 {
@@ -49 +48 @@
     public:
         EquipmentItem(BaseObject* creator);
-        virtual ~EquipmentItem();
+        virtual ~EquipmentItem() {}
     };
 }

code/branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc

@@ -33 +33 @@
 
 #include "ModifierPickup.h"
-#include "PickupCollection.h"
-
+
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-
 #include "objects/worldentities/pawns/Pawn.h"
 

code/branches/pch/src/orxonox/objects/pickup/ModifierPickup.h

@@ -35 +35 @@
 #define _ModifierPickup_H__
 
-#include <climits>
-
 #include "OrxonoxPrereqs.h"
 
+#include <climits>
+#include <map>
+
+#include "orxonox/tools/Timer.h"
+#include "ModifierType.h"
 #include "PassiveItem.h"
-#include "ModifierType.h"
-#include "orxonox/tools/Timer.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/pickup/ModifierType.h

@@ -35 +35 @@
 #define _ModifierType_H__
 
+#include "OrxonoxPrereqs.h"
+
 namespace orxonox
 {

code/branches/pch/src/orxonox/objects/pickup/PassiveItem.cc

@@ -28 +28 @@
 
 #include "PassiveItem.h"
-
 #include "core/CoreIncludes.h"
 
@@ -41 +40 @@
         RegisterObject(PassiveItem);
     }
-    //! Deconstructor.
-    PassiveItem::~PassiveItem()
-    {
-    }
 }

code/branches/pch/src/orxonox/objects/pickup/PassiveItem.h

@@ -36 +36 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "BaseItem.h"
 
@@ -49 +48 @@
     public:
         PassiveItem(BaseObject* creator);
-        virtual ~PassiveItem();
+        virtual ~PassiveItem() {}
     };
 }

code/branches/pch/src/orxonox/objects/pickup/PickupCollection.cc

@@ -34 +34 @@
 #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

code/branches/pch/src/orxonox/objects/pickup/PickupCollection.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
+#include <deque>
 #include <map>
-#include <deque>
 #include <string>
 
 #include "util/Math.h"
-
 #include "ModifierType.h"
 

code/branches/pch/src/orxonox/objects/pickup/PickupInventory.cc

@@ -28 +28 @@
 
 #include "PickupInventory.h"
-
-#include "EquipmentItem.h"
-#include "PassiveItem.h"
-#include "UsableItem.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>
@@ -46 +35 @@
 #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 "EquipmentItem.h"
+#include "PassiveItem.h"
+#include "UsableItem.h"
+
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/pickup/PickupInventory.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
+#include <CEGUIForwardRefs.h>
 #include "core/BaseObject.h"
-
-namespace CEGUI { class Window; class WindowManager; class Image; }
 
 // tolua_begin

code/branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -33 +33 @@
 
 #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
 
-#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/pickup/PickupSpawner.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
+#include "tools/Timer.h"
 #include "interfaces/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/pickup/UsableItem.cc

@@ -33 +33 @@
 
 #include "UsableItem.h"
-
 #include "core/CoreIncludes.h"
 
@@ -46 +45 @@
         RegisterObject(UsableItem);
     }
-    //! Deconstructor.
-    UsableItem::~UsableItem()
-    {
-    }
 }

code/branches/pch/src/orxonox/objects/pickup/UsableItem.h

@@ -36 +36 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "BaseItem.h"
 
@@ -49 +48 @@
     public:
         UsableItem(BaseObject* creator);
-        virtual ~UsableItem();
+        virtual ~UsableItem() { }
 
         /**

code/branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.cc

@@ -34 +34 @@
 #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

code/branches/pch/src/orxonox/objects/pickup/items/HealthImmediate.h

@@ -36 +36 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "objects/pickup/PassiveItem.h"
 

code/branches/pch/src/orxonox/objects/pickup/items/HealthUsable.cc

@@ -33 +33 @@
 
 #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

code/branches/pch/src/orxonox/objects/pickup/items/HealthUsable.h

@@ -35 +35 @@
 #define _HealthUsable_H__
 
-#include <climits>
-
 #include "OrxonoxPrereqs.h"
 
+#include <climits>
 #include "objects/pickup/UsableItem.h"
-#include "util/Math.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/pickup/items/Jump.cc

@@ -33 +33 @@
 
 #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

code/branches/pch/src/orxonox/objects/pickup/items/Jump.h

@@ -39 +39 @@
 #include "OrxonoxPrereqs.h"
 
+#include <climits>
+#include "util/Math.h"
 #include "objects/pickup/UsableItem.h"
-#include "util/Math.h"
 
 namespace orxonox