Merge pull request #169 from ampreeT/dialogue-friend-fix

Fixed `CAI_BaseNPC::FindNamedEntity` not catching friends
ampreeT · Nov 13, 2024 · 2ca775f · 2ca775f
2 parents 9a377be + c5231b4
commit 2ca775f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/scripting/include/srccoop/entitypatch.inc b/scripting/include/srccoop/entitypatch.inc
@@ -278,10 +278,13 @@ public MRESReturn Hook_FindNamedEntity(int _this, Handle hReturn, Handle hParams
 	{
 		char szName[MAX_CLASSNAME];
 		DHookGetParamString(hParams, 1, szName, sizeof(szName));
-		if ((strcmp(szName, "Player", false) == 0) || (strcmp(szName, "!player", false) == 0))
+		if ((strcmp(szName, "Player", false) == 0)
+			|| (strcmp(szName, "!player", false) == 0)
+			|| (strcmp(szName, "!nearestfriend", false) == 0)
+			|| (strcmp(szName, "!friend", false) == 0))
 		{
 			CBaseEntity pActor = CBaseEntity(DHookGetParam(hParams, 2));
-			if (pActor.IsValid())
+			if (pActor != NULL_CBASEENTITY)
 			{
 				CBasePlayer pBestPlayer = GetNearestPlayer(pActor);
 				if (pBestPlayer != NULL_CBASEENTITY)