Changeset 3087 for code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

Timestamp:

May 27, 2009, 2:45:54 PM (15 years ago)

Author:

landauf

Message:

merged particles branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (3 diffs)

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -39 +39 @@
 #include "objects/worldentities/ParticleSpawner.h"
 #include "objects/worldentities/ExplosionChunk.h"
+#include "objects/worldentities/BigExplosion.h"
 
 #include "objects/weaponsystem/WeaponSystem.h"
@@ -143 +144 @@
 
         if (GameMode::isMaster())
-          if (this->health_ <= 0)
-            this->death();
+            if (this->health_ <= 0 && bAlive_)
+                this->death();
     }
 
@@ -229 +230 @@
 
             if (GameMode::isMaster())
-                this->deatheffect();
-        }
-    }
-
+            {
+//                this->deathEffect();
+                this->goWithStyle();
+            }
+        }
+    }
+    void Pawn::goWithStyle()
+    {
+        this->bAlive_ = false;
+        this->setDestroyWhenPlayerLeft(false);
+
+        BigExplosion* chunk = new BigExplosion(this->getCreator());
+        chunk->setPosition(this->getPosition());
+
+    }
     void Pawn::deatheffect()
     {