Changeset 10692 for code/branches/fabienHS15/src/orxonox

Timestamp:

Oct 25, 2015, 7:09:11 PM (9 years ago)

Author:

fvultier

Message:

 

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

@@ -560 +560 @@
         else
             return 0;        
-    }    
+    }
+
+    Munition* Pawn::getMunition(SubclassIdentifier<Munition> * identifier)
+    {
+        if (weaponSystem_)
+        {
+            return weaponSystem_->getMunition(identifier);
+        }
+
+        return NULL;
+    }
 
     //Tell the Map (RadarViewable), if this is a playership

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

@@ -155 +155 @@
             WeaponPack * getWeaponPack(unsigned int index) const;
             std::vector<WeaponPack *> * getAllWeaponPacks();
+            
+            Munition * getMunition(SubclassIdentifier<Munition> * identifier);
 
             virtual void addedWeaponPack(WeaponPack* wPack) {}