Merge remote-tracking branch 'Half-LifeUpdated/master'

twhl-community · Oct 24, 2023 · deb6828 · deb6828
2 parents 84363e2 + e306d7a
commit deb6828
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -253,6 +253,7 @@ Can't be fixed:
 * Fixed player gaining health when drowning with god mode enabled and recovering health after surfacing (Thanks malortie)
 * Fixed human grunts continuing to fire for a few seconds after killing the last enemy in an area [Opposing Force Updated #100](https://github.com/SamVanheer/halflife-op4-updated/issues/100) (Thanks Ronin4862 and malortie)
 * Fixed crash when +USEing NPCs that have just exited a scripted sequence (Thanks malortie)
+* Fixed talk monsters resetting other talk monsters' dying schedule if they are both killed at the same time (Thanks FreeSlave)
 
 ### Features
 

diff --git a/dlls/talkmonster.cpp b/dlls/talkmonster.cpp
@@ -1179,7 +1179,7 @@ bool CTalkMonster::TakeDamage(entvars_t* pevInflictor, entvars_t* pevAttacker, f
 		{
 			CBaseEntity* pFriend = FindNearestFriend(false);
 
-			if (pFriend && pFriend->IsAlive())
+			if (pFriend && pFriend->IsAlive() && pFriend->pev->deadflag == DEAD_NO)
 			{
 				// only if not dead or dying!
 				CTalkMonster* pTalkMonster = (CTalkMonster*)pFriend;