Changeset 10692 for code/branches/fabienHS15/src

Timestamp:

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

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15/src

Files:

• modules/pickup/PickupRepresentation.cc (modified) (1 diff)
• modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• modules/pickup/items/DronePickup.h (modified) (2 diffs)
• modules/pickup/items/MunitionPickup.cc (added)
• modules/pickup/items/MunitionPickup.h (added)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/fabienHS15/src/modules/pickup/PickupRepresentation.cc

@@ -187 +187 @@
         Billboard* icon = new Billboard(spawner->getContext());
         icon->setColour(ColourValue(0.89f, 0.79f, 0.08f));
-        icon->setMaterial("asterisk");
+        icon->setMaterial("Unknown");
         icon->setScale(0.5);
         sphere->attach(icon);

code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt

@@ -8 +8 @@
   ShrinkPickup.cc
   DamageBoostPickup.cc
+  MunitionPickup.cc
 )

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

@@ -43 +43 @@
 #include "tools/interfaces/Tickable.h"
 
-namespace orxonox {
+namespace orxonox
+{
 
     /**
@@ -80 +81 @@
             std::string droneTemplate_; //!< The name of the template, based upon which the Drone is created.
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-
-
-
     };
 }

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) {}