Changeset 5860 for code/branches/core5/src/orxonox

Timestamp:

Oct 2, 2009, 8:41:33 PM (15 years ago)

Author:

landauf

Message:

using a WeakPtr in Projectile instead of inheriting from PawnListener
fixed another small inaccuracy in TeamDeathmatch

File:

• code/branches/core5/src/orxonox/gametypes/TeamDeathmatch.cc (modified) (1 diff)

code/branches/core5/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -100 +100 @@
     bool TeamDeathmatch::allowPawnHit(Pawn* victim, Pawn* originator)
     {
-        return (!this->pawnsAreInTheSameTeam(victim, originator));
+        return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator);
     }
 
     bool TeamDeathmatch::allowPawnDamage(Pawn* victim, Pawn* originator)
     {
-        return (!this->pawnsAreInTheSameTeam(victim, originator));
+        return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator);
     }
 
     bool TeamDeathmatch::allowPawnDeath(Pawn* victim, Pawn* originator)
     {
-        return (!this->pawnsAreInTheSameTeam(victim, originator));
+        return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator);
     }