no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@776 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-12-09 16:52:09 +00:00
parent 62759214f6
commit 8cb221eaa1
3 changed files with 6 additions and 10 deletions
-5
View File
@@ -240,11 +240,6 @@ void newprojectile(vec &from, vec &to, float speed, bool local, playerent *owner
void hit(int target, int damage, playerent *d, playerent *at, bool gib=false)
{
if(m_ctf && isteam(d->team, at->team))
{
flaginfo &enemyflag = flaginfos[team_opposite(team_int(d->team))];
if(enemyflag.state == CTFF_STOLEN && enemyflag.actor == d) return; // protect flag stealer from friendly-fire
};
d->lastpain = lastmillis;
if(d==player1 || d->type==ENT_BOT) selfdamage(damage, -1, at, gib, d);
else