Changeset 10293

Timestamp:

Mar 1, 2015, 8:59:15 PM (9 years ago)

Author:

landauf

Message:

avoid collisions between projectiles of a turret and the parent-pawn to which the turret is attached

Location:

code/trunk/src/modules/weapons/projectiles

Files:

• BasicProjectile.cc (modified) (2 diffs)
• BasicProjectile.h (modified) (1 diff)

code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -82 +82 @@
         if (!this->bDestroy_ && GameMode::isMaster())
         {
-            if (otherObject == this->getShooter() || otherObject->isA(Class(BasicProjectile))) // Prevents you from shooting yourself or other projectiles
+            if (this->isObjectRelatedToShooter(otherObject) || otherObject->isA(Class(BasicProjectile))) // Prevents you from shooting yourself or other projectiles
                 return false;
 
@@ -141 +141 @@
     }
 
+    /**
+     * Returns true if otherObject is equal to the shooter or if one of otherObject's parents is equal to the shooter or if one of the shooter's parent is equal to otherObject.
+     */
+    bool BasicProjectile::isObjectRelatedToShooter(WorldEntity* otherObject)
+    {
+        for (WorldEntity* shooter = this->getShooter(); shooter != NULL; shooter = shooter->getParent())
+            if (otherObject == shooter)
+                return true;
+        for (WorldEntity* object = otherObject; object != NULL; object = object->getParent())
+            if (otherObject == this->getShooter())
+                return true;
+
+        return false;
+    }
 
     /**

code/trunk/src/modules/weapons/projectiles/BasicProjectile.h

@@ -123 +123 @@
 
         private:
+            bool isObjectRelatedToShooter(WorldEntity* otherObject);
+
             WeakPtr<Pawn> shooter_; //!< The entity that fired the projectile.