Changeset 10436 for code/branches/weaponFS15/src/modules/weapons

Timestamp:

May 7, 2015, 10:45:20 PM (10 years ago)

Author:

meggiman

Message:

Fixed dangling pointer bug when GravityBomb was destroyed by tick of base class because of collision with other pawns.

File:

• code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc (modified) (3 diffs)

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc

@@ -54 +54 @@
         void GravityBomb::tick(float dt)
         {
-                        SUPER(GravityBomb,tick,dt);
                         timeToLife_ -= dt;
                         if(timeToLife_ < 0)
@@ -61 +60 @@
                                 setVelocity(Vector3::ZERO);
                                 setAcceleration(Vector3::ZERO);
-                                detonate();
+                                isDetonated_ = true;
                         }
                         else
@@ -69 +68 @@
                         }
                         if(isDetonated_) detonate();
+                        else SUPER(GravityBomb, tick, dt);
         }