From 5ba209e66f736a69ed3ed9fcb3b9035407f0d404 Mon Sep 17 00:00:00 2001 From: Roman Chistokhodov Date: Tue, 12 Nov 2019 08:42:24 +0300 Subject: [PATCH] Fix ally grunts not forming squads. Fix references to base class methods in TalkMonster code --- dlls/talkmonster.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/talkmonster.cpp b/dlls/talkmonster.cpp index 6dfc51d4..c9e666b2 100644 --- a/dlls/talkmonster.cpp +++ b/dlls/talkmonster.cpp @@ -611,7 +611,7 @@ void CTalkMonster::Killed( entvars_t *pevAttacker, int iGib ) // Don't finish that sentence StopTalking(); SetUse( NULL ); - CBaseMonster::Killed( pevAttacker, iGib ); + CSquadMonster::Killed( pevAttacker, iGib ); } CBaseEntity *CTalkMonster::EnumFriends( CBaseEntity *pPrevious, int listNumber, BOOL bTrace ) @@ -1301,7 +1301,7 @@ void CTalkMonster::TrySmellTalk( void ) void CTalkMonster::StartMonster() { - CBaseMonster::StartMonster(); + CSquadMonster::StartMonster(); if (m_fStartSuspicious) { ALERT(at_console, "Talk Monster Pre-Provoked\n"); Remember(bits_MEMORY_PROVOKED);