Changeset 10791 for code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Nov 9, 2015, 5:55:42 PM (9 years ago)

Author:

fvultier

Message:

Munition may and must now be defined for each pawn separately. This way a heavy cruiser may carry more munition than a drone.

File:

• code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) (4 diffs)

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

@@ -46 +46 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSet.h"
+#include "weaponsystem/Munition.h"
 #include "sound/WorldSound.h"
 
@@ -139 +140 @@
         XMLPortObject(Pawn, WeaponSlot, "weaponslots", addWeaponSlot, getWeaponSlot, xmlelement, mode);
         XMLPortObject(Pawn, WeaponSet, "weaponsets", addWeaponSet, getWeaponSet, xmlelement, mode);
-        XMLPortObject(Pawn, WeaponPack, "weapons", addWeaponPackXML, getWeaponPack, xmlelement, mode);
+        XMLPortObject(Pawn, WeaponPack, "weaponpacks", addWeaponPackXML, getWeaponPack, xmlelement, mode);
+        XMLPortObject(Pawn, Munition, "munition", addMunitionXML, getMunitionXML, xmlelement, mode);
 
         XMLPortParam(Pawn, "reloadrate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
@@ -557 +559 @@
     }
 
+    void Pawn::addMunitionXML(Munition* munition)
+    {
+        if (this->weaponSystem_ && munition)
+        {
+            this->weaponSystem_->addMunition(munition);
+        }
+    }
+
+    Munition* Pawn::getMunitionXML() const
+    {
+        return NULL;
+    }
+
     Munition* Pawn::getMunition(SubclassIdentifier<Munition> * identifier)
     {
@@ -570 +585 @@
     void Pawn::startLocalHumanControl()
     {
-//        SUPER(ControllableEntity, changedPlayer());
+//        SUPER(ControllableEntity, startLocalHumanControl());
         ControllableEntity::startLocalHumanControl();
         this->isHumanShip_ = true;