Make Killfeed use the Assisters team color if applicable instead of always using the Killers team color

ValveSoftware#1506

Author: RubyTheQuester

src/game/client/tf/hud_basedeathnotice.cpp

@@ -151,17 +151,22 @@ void CHudBaseDeathNotice::Paint()
 
 		wchar_t victim[256]=L"";
 		wchar_t killer[256]=L"";
+		wchar_t assister[256] = L"";
 
+		const wchar_t* plus = L"+";
 		// TEMP - print the death icon name if we don't have a material for it
 
 		g_pVGuiLocalize->ConvertANSIToUnicode( msg.Victim.szName, victim, sizeof( victim ) );
 		g_pVGuiLocalize->ConvertANSIToUnicode( msg.Killer.szName, killer, sizeof( killer ) );
+		g_pVGuiLocalize->ConvertANSIToUnicode( msg.Assister.szName, assister, sizeof( assister ) );
 
 		int iVictimTextWide = UTIL_ComputeStringWidth( m_hTextFont, victim ) + xSpacing;
 		int iDeathInfoTextWide= msg.wzInfoText[0] ? UTIL_ComputeStringWidth( m_hTextFont, msg.wzInfoText ) + xSpacing : 0;
 		int iDeathInfoEndTextWide= msg.wzInfoTextEnd[0] ? UTIL_ComputeStringWidth( m_hTextFont, msg.wzInfoTextEnd ) + xSpacing : 0;
 
 		int iKillerTextWide = killer[0] ? UTIL_ComputeStringWidth( m_hTextFont, killer ) + xSpacing : 0;
+		int iAssisterTextWide = assister[0] ? UTIL_ComputeStringWidth( m_hTextFont, assister ) + xSpacing : 0;
+		int iPlusTextWide = assister[0] ? UTIL_ComputeStringWidth( m_hTextFont, plus ) + xSpacing : 0;
 		int iLineTall = m_flLineHeight;
 		int iTextTall = surface()->GetFontTall( m_hTextFont );
 		int iconWide = 0, iconTall = 0, iDeathInfoOffset = 0, iVictimTextOffset = 0, iconActualWide = 0;
@@ -234,7 +239,7 @@ void CHudBaseDeathNotice::Paint()
 			iconPostVictimWide *= flScale;
 		}
 
-		int iTotalWide = iKillerTextWide + iconWide + iVictimTextWide + iDeathInfoTextWide + iDeathInfoEndTextWide + ( xMargin * 2 );
+		int iTotalWide = iKillerTextWide + iPlusTextWide + iAssisterTextWide + iconWide + iVictimTextWide + iDeathInfoTextWide + iDeathInfoEndTextWide + (xMargin * 2);
 		iTotalWide += iconPrekillerWide + iconPostkillerWide + iPreKillerTextWide + iconPostVictimWide;
 
 		int y = yStart + ( ( iLineTall + m_flLineSpacing ) * i );				
@@ -270,7 +275,13 @@ void CHudBaseDeathNotice::Paint()
 			DrawText( x, yText, m_hTextFont, GetTeamColor( msg.Killer.iTeam, msg.bLocalPlayerInvolved ), killer );
 			x += iKillerTextWide;
 		}
-
+		if ( assister[0] )
+		{
+			DrawText( x, yText, m_hTextFont, GetTeamColor( msg.Killer.iTeam == msg.Assister.iTeam ? msg.Assister.iTeam : TEAM_UNASSIGNED, msg.bLocalPlayerInvolved ), plus );
+			x += iPlusTextWide;
+			DrawText( x, yText, m_hTextFont, GetTeamColor( msg.Assister.iTeam, msg.bLocalPlayerInvolved ), assister );
+			x += iAssisterTextWide;
+		}
 		// prekiller text
 		if ( msg.wzPreKillerText[0] )
 		{

src/game/client/tf/hud_basedeathnotice.h

@@ -54,6 +54,7 @@ struct DeathNoticeItem
 
 	DeathNoticePlayer	Killer;
 	DeathNoticePlayer   Victim;
+	DeathNoticePlayer	Assister;
 	char		szIcon[32];		// name of icon to display
 	wchar_t		wzInfoText[32];	// any additional text to display next to icon
 	wchar_t		wzInfoTextEnd[32];	// any additional text to display next to victim name

src/game/client/tf/tf_hud_deathnotice.cpp

@@ -866,12 +866,13 @@ void CTFHudDeathNotice::OnGameEvent( IGameEvent *event, int iDeathNoticeMsg )
 			if ( pszAssisterName && (ePyroVisionHack == kHorriblePyroVisionHack_KillAssisterType_CustomName_First ||
 									 ePyroVisionHack == kHorriblePyroVisionHack_KillAssisterType_LocalizationString_First) )
 			{
-				std::swap( pszKillerName, pszAssisterName );
+				Q_strncpy(msg.Killer.szName, pszAssisterName, ARRAYSIZE(msg.Killer.szName));
+				pszAssisterName = pszKillerName;
 			}
 
-			char szKillerBuf[MAX_PLAYER_NAME_LENGTH*2];
-			Q_snprintf( szKillerBuf, ARRAYSIZE(szKillerBuf), "%s + %s", pszKillerName, pszAssisterName );
-			Q_strncpy( msg.Killer.szName, szKillerBuf, ARRAYSIZE( msg.Killer.szName ) );
+			msg.Assister.iTeam = (iAssisterID > 0 ? g_PR->GetTeam(iAssisterID) : msg.Killer.iTeam);
+			Q_strncpy(msg.Assister.szName, pszAssisterName, ARRAYSIZE(msg.Assister.szName));
+
 			if ( iLocalPlayerIndex == iAssisterID )
 			{
 				msg.bLocalPlayerInvolved = true;
@@ -1307,9 +1308,8 @@ void CTFHudDeathNotice::OnGameEvent( IGameEvent *event, int iDeathNoticeMsg )
 		const char *assister_name = ( iAssisterID > 0 ? g_PR->GetPlayerName( iAssisterID ) : NULL );
 		if ( assister_name )
 		{
-			char szKillerBuf[MAX_PLAYER_NAME_LENGTH*2];
-			Q_snprintf( szKillerBuf, ARRAYSIZE(szKillerBuf), "%s + %s", msg.Killer.szName, assister_name );
-			Q_strncpy( msg.Killer.szName, szKillerBuf, ARRAYSIZE( msg.Killer.szName ) );
+			msg.Assister.iTeam = g_PR->GetTeam(iAssisterID);
+			Q_strncpy(msg.Assister.szName, assister_name, ARRAYSIZE(msg.Assister.szName));
 		}
 	}
 	//else if ( FStrEq( "throwable_hit", pszEventName ) )