From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 30 Jan 2012 19:29:53 +0000 (+0200)
Subject: Lastly, show portraits when they need to be shown, and sent the right player. Current... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eeb4535f7c4bd3c811f50f3c67c52a1bf3557aab;p=voretournament%2Fvoretournament.git

Lastly, show portraits when they need to be shown, and sent the right player. Currently, a player who gets fragged is shown the portrait of the attacker, and a player who shoots a team mate to attract their attention. Using taunts later on would be better, TODO.
---

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index f2e6d2a6..71c0a815 100644
--- 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)));
 						}
 						SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);
+						portrait(attacker, targ);
 					}
 				}
 				else
@@ -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)));
 						}
 						SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);
+						portrait(attacker, targ);
 					}
 				}
 
@@ -653,8 +655,6 @@ entity damage_attacker;
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
-	portrait(attacker, attacker); // TEMPORARY TEST
-
 	float mirrordamage;
 	float mirrorforce;
 	float teamdamage0;
@@ -858,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);
 					}
 				}
 			}
diff --git a/docs/TODO.txt b/docs/TODO.txt
index 2e5196c4..f363c892 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -116,6 +116,8 @@
 
 - 0.8: Allow player colors in chat portraits.
 
+- 0.8: Show portraits for all taunts types, but without spamming them unnecessarily.
+
 - +0.8: Fix flying spectators not going through teleporters and warpzones. Very hard, since they're FLY_WORLDONLY and can't touch triggers
 
 - 0.7: Randomize all punchangles.