Changeset 11783 for code/trunk/src/modules/pickup

Timestamp:

Feb 20, 2018, 12:14:40 AM (7 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/PickupSpawner.cc (modified) (1 diff)
• src/modules/pickup/PickupSpawner.h (modified) (5 diffs)

code/trunk/src/modules/pickup/PickupPrereqs.h

@@ -72 +72 @@
     class Pickup;
     class PickupCollection;
-    class PickupInventoryContainer;
+    struct PickupInventoryContainer;
     class PickupManager;
     class PickupRepresentation;

code/trunk/src/modules/pickup/PickupSpawner.cc

@@ -158 +158 @@
             for(Pawn* pawn : ObjectList<Pawn>())
             {
+                if(!(pawn->doesAcceptPickups())){continue;} // skip those pawns, e.g. AsteroidMinables. 
+
                 Vector3 distance = pawn->getWorldPosition() - this->getWorldPosition();
                 PickupCarrier* carrier = static_cast<PickupCarrier*>(pawn);

code/trunk/src/modules/pickup/PickupSpawner.h

@@ -92 +92 @@
                 { return this->triggerDistance_; }
             /**
+            @brief Set the distance in which to trigger.
+            @param value The new distance in which to trigger.
+            */
+            inline void setTriggerDistance(float value)
+                { this->triggerDistance_ = value; }
+            /**
             @brief Get the time to respawn.
             @returns Returns the time after which this gets re-actived.
@@ -98 +104 @@
                 { return this->respawnTime_; }
             /**
+            @brief Set the time to respawn.
+            @param time New time after which this gets re-actived.
+            */
+            inline void setRespawnTime(float time)
+                { this->respawnTime_ = time; }
+            /**
             @brief Get the maximum number of items that will be spawned by this PickupSpawner.
             @return Returns the maximum number of items spawned by this PickupSpawner.
@@ -103 +115 @@
             inline int getMaxSpawnedItems(void) const
                 { return this->maxSpawnedItems_; }
+            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
+
             /**
             @brief Returns the name of the template which is used to create a pickup for this spawner.
@@ -113 +127 @@
             inline Template* getPickupTemplate() const
                 {return this->pickupTemplate_; }
+
+            void setPickupTemplateName(const std::string& name);
+            void setPickupTemplate(Template* temp);
 
         private:
@@ -130 +147 @@
             void block(PickupCarrier* carrier, unsigned int time = DEFAULT_BLOCKED_TIME)
                 { this->blocked_.insert(std::pair<PickupCarrier*, std::time_t>(carrier, std::time(0)+time)); }
-
-            /**
-            @brief Set the distance in which to trigger.
-            @param value The new distance in which to trigger.
-            */
-            inline void setTriggerDistance(float value)
-                { this->triggerDistance_ = value; }
-            /**
-            @brief Set the time to respawn.
-            @param time New time after which this gets re-actived.
-            */
-            inline void setRespawnTime(float time)
-                { this->respawnTime_ = time; }
-
-            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
-
-            void setPickupTemplateName(const std::string& name);
-            void setPickupTemplate(Template* temp);
 
             Pickupable* createPickup(void); //!< Creates a new Pickupable.