X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=data%2Fqcsrc%2Fserver%2Fg_damage.qc;h=4b304b89eb8fcc4b7da34d84ccd720786b503432;hb=47bc216a79265cfc9c709b951f5e421e91844063;hp=65e2c0920287a1fba9cdb210d0a29fde8f0ae7de;hpb=5eadf772f358d47a18e137ce773b63f187a1871f;p=voretournament%2Fvoretournament.git diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 65e2c092..4b304b89 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -384,6 +384,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) } SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH); } + portrait(attacker, targ); } else { @@ -400,6 +401,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) } SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH); } + portrait(attacker, targ); } if(sv_gentle) { @@ -856,6 +858,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float attacker.teamkill_complain = time + 5; attacker.teamkill_soundtime = time + 0.4; attacker.teamkill_soundsource = targ; + portrait(targ, attacker); } } } @@ -863,7 +866,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // lean the player based on the amount of damage taken if(cvar("g_leanplayer_damage")) - if(WEP_VALID(DEATH_WEAPONOF(deathtype))) // only for damage caused by weapons + if(targ.classname == "player" && WEP_VALID(DEATH_WEAPONOF(deathtype))) // only for damage caused by weapons { targ.leanangle_damage_loc = hitloc - targ.origin; targ.leanangle_damage_force += force * cvar("g_leanplayer_damage"); // keep existing force if any