Changeset 10731 for code/branches/AI_HS15/src/orxonox/worldentities/pawns

Timestamp:

Oct 31, 2015, 4:07:29 PM (9 years ago)

Author:

gania

Message:

added a little bit of firing functionality

Location:

code/branches/AI_HS15/src/orxonox/worldentities/pawns

Files:

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

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

@@ -320 +320 @@
     }
 
+
     void Pawn::death()
     {
@@ -325 +326 @@
         if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
         {
-            // Set bAlive_ to false and wait for destroyLater() to do the destruction
+            // Set bAlive_ to false and wait for PawnManager to do the destruction
             this->bAlive_ = false;
-            this->destroyLater();
 
             this->setDestroyWhenPlayerLeft(false);
@@ -367 +367 @@
             if (GameMode::isMaster())
             {
-                this->deatheffect();
+//                this->deathEffect();
                 this->goWithStyle();
             }
@@ -387 +387 @@
     {
         // play death effect
-        /*{
+        {
             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
             effect->setPosition(this->getPosition());
@@ -410 +410 @@
             effect->setSource("Orxonox/sparks");
             effect->setLifetime(4.0f);
-        }*/
-        
-        
-        {
-            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
-            effect->setPosition(this->getPosition());
-            effect->setOrientation(this->getOrientation());
-            effect->setDestroyAfterLife(true);
-            effect->setSource("orxonox/explosion_flash2");
-            effect->setLifetime(5.0f);
-        }
-        {
-            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
-            effect->setPosition(this->getPosition());
-            effect->setOrientation(this->getOrientation());
-            effect->setDestroyAfterLife(true);
-            effect->setSource("orxonox/explosion_flame2");
-            effect->setLifetime(5.0f);
-        }
-        {
-            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
-            effect->setPosition(this->getPosition());
-            effect->setOrientation(this->getOrientation());
-            effect->setDestroyAfterLife(true);
-            effect->setSource("orxonox/explosion_shockwave2");
-            effect->scale(20);
-            effect->setLifetime(5.0f);
-        }{
-            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
-            effect->setPosition(this->getPosition());
-            effect->setOrientation(this->getOrientation());
-            effect->setDestroyAfterLife(true);
-            effect->setSource("orxonox/explosion_sparks2");
-            effect->setLifetime(5.0f);
-        }
-        {
-            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
-            effect->setPosition(this->getPosition());
-            effect->setOrientation(this->getOrientation());
-            effect->setDestroyAfterLife(true);
-            effect->setSource("orxonox/explosion_streak2");
-            effect->setLifetime(5.0f);
-        }
-        {
-            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
-            effect->setPosition(this->getPosition());
-            effect->setOrientation(this->getOrientation());
-            effect->setDestroyAfterLife(true);
-            effect->setSource("orxonox/explosion_afterglow");
-            effect->scale(20);
-            effect->setLifetime(5.0f);
-        }
-        
-        
+        }
         for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
         {

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

@@ -39 +39 @@
 
 namespace orxonox // tolua_export
-{
-    /**
-    @brief
-        Everything in Orxonoy that has a health attribute is a Pawn. After a Pawn is spawned its health is set to
-        its initial health. In every call of the Pawns tick function the game checks whether the pawns health is at
-        or below zero. If it is, the pawn gets killed.
-
-        Pawns can carry pickups and fire weapons. The can also have shields.
-
-        Notice that every Pawn is a ControllableEntity.
-    */
-
-    // tolua_export
+{ // tolua_export
     class _OrxonoxExport Pawn // tolua_export
         : public ControllableEntity, public RadarViewable, public PickupCarrier