CVS: bzflag/src/bzflag LocalPlayer.cxx,2.54,2.55

[Jeff M. <jef...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11059/src/bzflag

Modified Files:
	LocalPlayer.cxx 
Log Message:
your own shots are still deadly to you in no teamkill mode

Index: LocalPlayer.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/LocalPlayer.cxx,v
retrieving revision 2.54
retrieving revision 2.55
diff -w -u -r2.54 -r2.55
--- LocalPlayer.cxx	13 Oct 2006 17:28:27 -0000	2.54
+++ LocalPlayer.cxx	17 Oct 2006 20:03:47 -0000	2.55
@@ -1492,7 +1492,7 @@
     if (source == this && ((shot->getFlag() == Flags::ShockWave) || (shot->getFlag() == Flags::Thief))) continue;
 
 	// if no team kills, shots of my team can't kill me
-	if ( shot->getTeam() != RogueTeam && !World::getWorld()->allowTeamKills() && shot->getTeam() == getTeam())
+	if (source != this && shot->getTeam() != RogueTeam && !World::getWorld()->allowTeamKills() && shot->getTeam() == getTeam())
 		 continue;
 
     // short circuit test if shot can't possibly hit.