Add support for NPC death notices and target IDs

Author: Blixibon

src/game/client/hl2mp/hl2mp_hud_target_id.cpp

@@ -13,6 +13,9 @@
 #include "iclientmode.h"
 #include "vgui/ILocalize.h"
 #include "hl2mp_gamerules.h"
+#ifdef MAPBASE_MP
+#include "c_ai_basenpc.h"
+#endif
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -161,8 +164,12 @@ void CTargetID::Paint()
 
 			bShowPlayerName = true;
 			g_pVGuiLocalize->ConvertANSIToUnicode( pPlayer->GetPlayerName(),  wszPlayerName, sizeof(wszPlayerName) );
-			
+
+#ifdef MAPBASE_MP
+			if ( HL2MPRules()->PlayerRelationship( pLocalPlayer, pPlayer ) == GR_TEAMMATE )
+#else
 			if ( HL2MPRules()->IsTeamplay() == true && pPlayer->InSameTeam(pLocalPlayer) )
+#endif
 			{
 				printFormatString = "#Playerid_sameteam";
 				bShowHealth = true;
@@ -179,6 +186,52 @@ void CTargetID::Paint()
 				wszHealthText[ ARRAYSIZE(wszHealthText)-1 ] = '\0';
 			}
 		}
+#ifdef MAPBASE_MP
+		else
+		{
+			extern ConVar sv_hl2mp_npc_target_id;
+			if (sv_hl2mp_npc_target_id.GetBool())
+			{
+				C_BaseEntity *pEnt = cl_entitylist->GetEnt( iEntIndex );
+				const char *pszPlayerName = pEnt->GetPlayerName();
+
+				if (pszPlayerName && *pszPlayerName && (!pEnt->IsNPC() || !pEnt->MyNPCPointer()->IsNeutralTo( pLocalPlayer )))
+				{
+					c = GetColorForTargetTeam( pEnt->GetTeamNumber() );
+
+					bShowPlayerName = true;
+
+					wchar_t *pLocalized = g_pVGuiLocalize->Find( pszPlayerName );
+					if (pLocalized)
+					{
+						V_wcsncpy( wszPlayerName, pLocalized, sizeof( wszPlayerName ) );
+					}
+					else
+					{
+						g_pVGuiLocalize->ConvertANSIToUnicode( pszPlayerName, wszPlayerName, sizeof( wszPlayerName ) );
+					}
+			
+					if ( (HL2MPRules()->IsTeamplay() == true && pEnt->InSameTeam(pLocalPlayer)) || (pEnt->IsNPC() && pEnt->MyNPCPointer()->IsPlayerAlly(pLocalPlayer)) )
+					{
+						printFormatString = "#Playerid_sameteam";
+						bShowHealth = true;
+					}
+					else
+					{
+						printFormatString = "#Playerid_diffteam";
+					}
+		
+
+					if ( bShowHealth )
+					{
+						// NPCs show their health directly
+						_snwprintf( wszHealthText, ARRAYSIZE(wszHealthText) - 1, L"%i",  pEnt->GetHealth() );
+						wszHealthText[ ARRAYSIZE(wszHealthText)-1 ] = '\0';
+					}
+				}
+			}
+		}
+#endif
 
 		if ( printFormatString )
 		{