ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for FS#27 - No Weapon Damage

This commit is contained in:
Walter Julius Hennecke 2012-12-22 19:12:00 +01:00
parent 0cff0dec5a
commit b5a5a4a4d8
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
code/game/g_combat.c
View File

@ -1211,29 +1211,9 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
}
}
// if TF_NO_FRIENDLY_FIRE is set, don't do damage to the target
// if the attacker was on the same team
// check for completely getting out of the damage
if ( !(dflags & DAMAGE_NO_PROTECTION) ) {
if ( !(dflags&DAMAGE_ALL_TEAMS) && mod != MOD_TELEFRAG && mod != MOD_DETPACK && targ != attacker )
{
if ( attacker->client && targ->client )
{//this only matters between clients
if ( !g_friendlyFire.integer )
{//friendly fire is not allowed
return;
}
}
else
{//team damage between non-clients is never legal
return;
}
}
// check for godmode
if ( targ->flags & FL_GODMODE ) {
return;
}
// check for godmode
if ( targ->flags & FL_GODMODE ) {
return;
}
// always give half damage if hurting self