Changeset 10715 for code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h

Timestamp:

Oct 27, 2015, 9:08:40 PM (9 years ago)

Author:

fvultier

Message:

 

File:

• code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (modified) (2 diffs)

code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h

@@ -39 +39 @@
 
 #include <string>
+#include <vector>
 
 #include "pickup/Pickup.h"
+#include "pickup/items/MunitionContainer.h"
 #include "core/class/SubclassIdentifier.h"
 #include "weaponsystem/Munition.h"
@@ -58 +60 @@
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
 
-        protected:
-            void setMunitionName(const std::string& munitionname);
-            inline const std::string& getMunitionName() const
-                { return this->munitionname_; }
-            void setMunitionAmount(int munitionAmount);
-            inline int getMunitionAmount() const
-                { return this->munitionAmount_; }
+            virtual void addMunitionContainer(MunitionContainer* munitionContainer);
+            MunitionContainer* getMunitionContainer(unsigned int index);
 
         private:            
             void initialize(void); //!< Initializes the member variables.
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-
-            SubclassIdentifier<Munition> munitionType_; //!< Indentifier of the munition type.
-            std::string munitionname_; //!< String containing the class name of the munition type (e.g. "LaserMunition")
-            int munitionAmount_; //!< The amount of munition added if the pickup is used
+            
+            std::vector<MunitionContainer*> munitionContainers_;
 
     };