Changeset 2319 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h

Timestamp:

Dec 3, 2008, 3:11:48 PM (16 years ago)

Author:

polakma

Message:

fixed WeaponPack attaching

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (3 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h

@@ -36 +36 @@
 
 #include "WeaponSet.h"
+#include "WeaponPack.h"
 
 namespace orxonox
@@ -53 +54 @@
             void fire(WeaponMode::Enum fireMode);
             //void setActiveWeaponSet(unsigned int n);
-            void attachWeaponPack(WeaponPack * wPack, int setNumber);
+            void attachWeaponPack(WeaponPack * wPack, unsigned int firemode);
             WeaponSet * getWeaponSetPointer(unsigned int n);
             WeaponSlot * getWeaponSlotPointer(unsigned int n);
-
+            WeaponPack * getWeaponPackPointer(unsigned int n);
             void setNewMunition(std::string munitionType, Munition * munitionToAdd);
             Munition * getMunitionType(std::string munitionType);
 
-            inline void setParentSpaceShip(SpaceShip *parentSpaceShip)
-                { parentSpaceShip_=parentSpaceShip; }
-            inline SpaceShip * getParentSpaceShip()
-                { return parentSpaceShip_; }
+            inline void setParentPawn(Pawn *parentPawn)
+                { parentPawn_=parentPawn; }
+            inline Pawn * getParentPawn()
+                { return parentPawn_; }
 
             inline int getWeaponSlotSize()
@@ -71 +72 @@
             std::vector<WeaponSet *> weaponSets_;
             std::vector<WeaponSlot *> weaponSlots_;
+            std::vector<WeaponPack *> weaponPacks_;
             std::map<std::string, Munition *> munitionSet_;
             WeaponSet *activeWeaponSet_;
-            SpaceShip *parentSpaceShip_;
+            Pawn *parentPawn_;
     };
 }