Changeset 2497 for code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

Timestamp:

Dec 17, 2008, 5:41:29 AM (15 years ago)

Author:

landauf

Message:

• some changes, maybe fixed a crash, not sure
• fixed strange camera behavior

File:

• code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) (4 diffs)

code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -40 +40 @@
 #include "objects/worldentities/Model.h"
 #include "objects/worldentities/ParticleSpawner.h"
-#include "objects/worldentities/pawns/Pawn.h"
 #include "objects/collisionshapes/SphereCollisionShape.h"
 #include "core/Core.h"
@@ -63 +62 @@
         this->attachCollisionShape(shape);
 
-        if(!Core::isClient()) //only if not on client
+        if(Core::isMaster())
           this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
     }
@@ -91 +90 @@
     void Projectile::destroyObject()
     {
-        delete this;
+        if (Core::isMaster())
+            delete this;
     }
 
     bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        if (!this->bDestroy_)
+        if (!this->bDestroy_ && Core::isMaster())
         {
             this->bDestroy_ = true;
-            Pawn* victim = dynamic_cast<Pawn*>(otherObject);
-            if (victim)
-                victim->damage(this->damage_, this->owner_);
-
 
             if (this->owner_)
@@ -123 +119 @@
                 }
             }
+
+            Pawn* victim = dynamic_cast<Pawn*>(otherObject);
+            if (victim)
+                victim->damage(this->damage_, this->owner_);
         }
         return false;
     }
+
+    void Projectile::destroyedPawn(Pawn* pawn)
+    {
+        if (this->owner_ == pawn)
+            this->owner_ = 0;
+    }
 }