Changeset 10688 for code/branches/fabienHS15/src/orxonox/worldentities

Timestamp:

Oct 24, 2015, 10:51:18 PM (9 years ago)

Author:

fvultier

Message:

There is now a HUD that shows the status of the weapon system: all weapons, weapon modes and their munition. Progress bars show the progress of replenishing munition.

Location:

code/branches/fabienHS15/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (1 diff)
• Pawn.h (modified) (1 diff)

code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc

@@ -554 +554 @@
     }
 
+    std::vector<WeaponPack *> * Pawn::getAllWeaponPacks()
+    {
+        if (this->weaponSystem_)
+            return this->weaponSystem_->getAllWeaponPacks();
+        else
+            return 0;        
+    }    
+
     //Tell the Map (RadarViewable), if this is a playership
     void Pawn::startLocalHumanControl()

code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h

@@ -154 +154 @@
             void addWeaponPackXML(WeaponPack * wPack);
             WeaponPack * getWeaponPack(unsigned int index) const;
+            std::vector<WeaponPack *> * getAllWeaponPacks();
 
             virtual void addedWeaponPack(WeaponPack* wPack) {}