Changeset 11730 for code/branches/Presentation_HS17_merge/src/modules/pickup/PickupSpawner.h

Timestamp:

Feb 11, 2018, 4:52:54 PM (7 years ago)

Author:

landauf

Message:

merged AsteroidMining_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

• . (modified) (1 prop)
• src/modules/pickup/PickupSpawner.h (modified) (2 diffs)

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

@@ -114 +114 @@
                 {return this->pickupTemplate_; }
 
+
+            void setPickupTemplateName(const std::string& name);
+            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
+
+            inline void setRespawnTime(float time)
+                { this->respawnTime_ = time; }
+
+
         private:
             void initialize(void);
@@ -141 +149 @@
             @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);