Lastly, show portraits when they need to be shown, and sent the right player. Current...

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index f2e6d2a60a78442fd2705cf2dc404a443cce5746..71c0a815359de364feb1948c019eff5c59a76500 100644 (file)
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -383,6 +383,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                        centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were eaten by ^7", a, GetAdvancedDeathReports(attacker)));\r
                                                }\r
                                                SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
+                                               portrait(attacker, targ);\r
                                        }\r
                                }\r
                                else\r
@@ -399,6 +400,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                        centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were killed by ^7", a, GetAdvancedDeathReports(attacker)));\r
                                                }\r
                                                SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
+                                               portrait(attacker, targ);\r
                                        }\r
                                }\r
 \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

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 2e5196c412118f2d69cc4ef6f2815c464d618ccd..f363c892374feb79001b1de277660200eb5feb0d 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -116,6 +116,8 @@
 \r
 - 0.8: Allow player colors in chat portraits.\r
 \r
+- 0.8: Show portraits for all taunts types, but without spamming them unnecessarily.\r
+\r
 - +0.8: Fix flying spectators not going through teleporters and warpzones. Very hard, since they're FLY_WORLDONLY and can't touch triggers\r
 \r
 - 0.7: Randomize all punchangles.\r