Fix the 'kill' command
This commit is contained in:
parent
7bb9281db7
commit
3ef5e6c009
5 changed files with 8 additions and 4 deletions
|
@ -133,7 +133,7 @@ float m_consolecommand(string cmd)
|
|||
m_display();
|
||||
break;
|
||||
default:
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
return FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -101,8 +101,12 @@ void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos
|
|||
}
|
||||
dprint( sprintf( "[DEBUG] Hit Bodypart: %s\n", Damage_GetHitLocation( trace_surface_id ) ) );
|
||||
|
||||
if ( Damage_ShouldDamage( eTarget.team, eAttacker.team ) == FALSE && autocvar_mp_friendlyfire == 0 ) {
|
||||
return;
|
||||
if (eTarget != eAttacker) {
|
||||
if ( !Damage_ShouldDamage(eTarget.team, eAttacker.team)) {
|
||||
if (!autocvar_mp_friendlyfire) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
eTarget.velocity = [0,0,0];
|
||||
|
|
Binary file not shown.
BIN
freecs/menu.dat
BIN
freecs/menu.dat
Binary file not shown.
BIN
freecs/progs.dat
BIN
freecs/progs.dat
Binary file not shown.
Loading…
Reference in a new issue