Changeset 6405 for code/branches/pickup2/src/modules/pickup/PickupSpawner.h

Timestamp:

Dec 23, 2009, 8:27:17 PM (14 years ago)

Author:

dafrick

Message:

Commit changes in pickup before merge.

Location:

code/branches/pickup2/src/modules/pickup

Files:

• . (added)
• PickupSpawner.h (moved) (moved from code/branches/pickup2/src/orxonox/pickup/PickupSpawner.h) (5 diffs)

code/branches/pickup2/src/modules/pickup/PickupSpawner.h

@@ -35 +35 @@
 #define _PickupSpawner_H__
 
-#include "OrxonoxPrereqs.h"
+#include "pickup/PickupPrereqs.h"
 
 #include <string>
@@ -41 +41 @@
 #include "tools/interfaces/Tickable.h"
 #include "worldentities/StaticEntity.h"
+#include "interfaces/Pickupable.h"
 
 namespace orxonox
@@ -51 +52 @@
     {
         public:
-            //TODO: Add limit of items spawned here. Also possibility to spawn collections?
+            //TODO: Add limit of items spawned here.
             PickupSpawner(BaseObject* creator);
-            PickupSpawner(BaseObject* creator, BaseItem* item, float triggerDistance, float respawnTime, int maxSpawnedItems);
+            PickupSpawner(BaseObject* creator, Pickupable* pickup, float triggerDistance, float respawnTime, int maxSpawnedItems);
             virtual ~PickupSpawner();
 
@@ -59 +60 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< Method for creating a PickupSpawner through XML.
             virtual void tick(float dt);
-
-            void trigger(Pawn* pawn);                                       //!< Method called when a Pawn is close enough.
-            void respawnTimerCallback();                                    //!< Method called when the timer runs out.
-
-            /**
-            @brief Get the template name for the item to spawn.
-            @return Returns the name of the template of the item to spawn.
-            */
-            inline const std::string& getItemTemplateName() const
-                { return this->itemTemplateName_; }
-            void setItemTemplateName(const std::string& name);              //!< Set the template name of the item to spawn.
-
-            /**
-                @brief Get the template for the item to spawn.
-                @return Returns the template of the item to spawn.
-            */
-            inline Template* getItemTemplate() const
-                { return this->itemTemplate_; }
 
             /**
@@ -110 +93 @@
 
         protected:
-            virtual BaseItem* getItem(void);
+            virtual Pickupable* getPickup(void);
+            
+            void addPickupable(Pickupable* pickup);
+            Pickupable* getPickupable(void);
+            
+            void decrementSpawnsRemaining(void);
 
         private:
             void initialize(void);
+            
+            void trigger(Pawn* pawn);                                       //!< Method called when a Pawn is close enough.
+            void respawnTimerCallback();                                    //!< Method called when the timer runs out.
 
-            std::string itemTemplateName_;          //!< Template name of the item to spawn.
-            Template* itemTemplate_;                //!< Template of the item to spawn.
+            
+            Pickupable* pickup_;
 
             int maxSpawnedItems_;                   //!< Maximum number of items spawned by this PickupSpawner.