]> git.xonotic.org Git - voretournament/voretournament.git/blobdiff - data/qcsrc/server/g_damage.qc
Same for the falling sounds
[voretournament/voretournament.git] / data / qcsrc / server / g_damage.qc
index f2e6d2a60a78442fd2705cf2dc404a443cce5746..4b304b89eb8fcc4b7da34d84ccd720786b503432 100644 (file)
@@ -384,6 +384,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                }\r
                                                SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
                                        }\r
+                                       portrait(attacker, targ);\r
                                }\r
                                else\r
                                {\r
@@ -400,6 +401,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                }\r
                                                SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
                                        }\r
+                                       portrait(attacker, targ);\r
                                }\r
 \r
                                if(sv_gentle) {\r
@@ -653,8 +655,6 @@ entity damage_attacker;
 \r
 void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)\r
 {\r
-       portrait(attacker, attacker); // TEMPORARY TEST\r
-\r
        float mirrordamage;\r
        float mirrorforce;\r
        float teamdamage0;\r
@@ -858,6 +858,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                                attacker.teamkill_complain = time + 5;\r
                                                attacker.teamkill_soundtime = time + 0.4;\r
                                                attacker.teamkill_soundsource = targ;\r
+                                               portrait(targ, attacker);\r
                                        }\r
                                }\r
                        }\r