Changeset 10962 for code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h

Timestamp:

Dec 9, 2015, 4:03:59 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and exlposionChunks branches. Works fine. Added explosion parts to hovership.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (4 diffs)

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

@@ -33 +33 @@
 
 #include <string>
+#include <vector>
 #include "interfaces/PickupCarrier.h"
 #include "interfaces/RadarViewable.h"
 #include "worldentities/ControllableEntity.h"
+#include "worldentities/ExplosionPart.h"
 
 
@@ -142 +144 @@
             virtual void fired(unsigned int firemode);
             virtual void postSpawn();
+
+            void addExplosionPart(ExplosionPart* ePart);
+            ExplosionPart * getExplosionPart();
 
             void addWeaponSlot(WeaponSlot * wSlot);
@@ -206 +211 @@
             virtual Controller* getSlave();
             virtual void goWithStyle();
-            virtual void deatheffect();
             virtual void spawneffect();
 
@@ -241 +245 @@
             unsigned int numexplosionchunks_;
 
+            std::vector<ExplosionPart*> explosionPartList_;
+
         private:
             void registerVariables();