Changeset 3054 for code/branches

Timestamp:

May 25, 2009, 12:37:19 PM (16 years ago)

Author:

decapitb

Message:

everything

Location:

code/branches/particles/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• objects/worldentities/BigExplosion.cc (added)
• objects/worldentities/BigExplosion.h (added)
• objects/worldentities/CMakeLists.txt (modified) (1 diff)
• objects/worldentities/pawns/Pawn.cc (modified) (3 diffs)
• objects/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/particles/src/orxonox/OrxonoxPrereqs.h

@@ -143 +143 @@
     class Billboard;
     class BlinkingBillboard;
+    class BigExplosion;
     class ExplosionChunk;
     class FadingBillboard;

code/branches/particles/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -9 +9 @@
   Billboard.cc
   BlinkingBillboard.cc
+  BigExplosion.cc       
   ExplosionChunk.cc
   FadingBillboard.cc

code/branches/particles/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -39 +39 @@
 #include "objects/worldentities/ParticleSpawner.h"
 #include "objects/worldentities/ExplosionChunk.h"
+#include "objects/worldentities/BigExplosion.h"
 
 namespace orxonox
@@ -129 +130 @@
         this->firehack_ = 0x0;
 
-        if (this->health_ <= 0)
+        if (this->health_ <= 0 && bAlive_){
             this->death();
+        }
     }
 
@@ -212 +214 @@
 
             if (Core::isMaster())
-                this->deatheffect();
+            // this->deathEffect();
+                this->goWithStyle();
         }
         else
             this->setHealth(1);
     }
-
+    void Pawn::goWithStyle()
+    {
+        this->bAlive_ = false;
+        this->setDestroyWhenPlayerLeft(false);
+
+        BigExplosion* chunk = new BigExplosion(this->getCreator());
+        chunk->setPosition(this->getPosition());
+
+    }
     void Pawn::deatheffect()
     {

code/branches/particles/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -114 +114 @@
         protected:
             virtual void death();
+            virtual void goWithStyle();
             virtual void deatheffect();
             virtual void spawneffect();