Fix the events sometimes playing second time after the attack animati…

…on. Controlled by anim_attack_reset_fix cvar
FreeSlave · Dec 16, 2024 · dd0cd12 · dd0cd12
1 parent 110f93d
commit dd0cd12
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/dlls/game.cpp b/dlls/game.cpp
@@ -742,6 +742,7 @@ cvar_t satchelfix	= { "satchelfix", "1", FCVAR_SERVER };
 cvar_t explosionfix	= { "explosionfix", "1", FCVAR_SERVER };
 cvar_t monsteryawspeedfix	= { "monsteryawspeedfix", "1", FCVAR_SERVER };
 cvar_t animeventfix = {"animeventfix", "0", FCVAR_SERVER };
+cvar_t anim_attack_reset_fix = {"anim_attack_reset_fix", "1", FCVAR_SERVER };
 cvar_t corpsephysics = { "corpsephysics", "0", FCVAR_SERVER };
 cvar_t pushablemode = { "pushablemode", "0", FCVAR_SERVER };
 cvar_t forcerespawn	= { "mp_forcerespawn","1", FCVAR_SERVER };
@@ -1578,6 +1579,7 @@ void GameDLLInit( void )
 	CVAR_REGISTER( &explosionfix );
 	CVAR_REGISTER( &monsteryawspeedfix );
 	CVAR_REGISTER( &animeventfix );
+	CVAR_REGISTER( &anim_attack_reset_fix );
 	CVAR_REGISTER( &corpsephysics );
 	CVAR_REGISTER( &pushablemode );
 	CVAR_REGISTER( &forcerespawn );

diff --git a/dlls/gonome.cpp b/dlls/gonome.cpp
@@ -50,8 +50,6 @@
 #define GONOME_AE_BITE3			( 21 )
 #define GONOME_AE_BITE4			( 22 )
 
-#define GONOME_SCRIPT_EVENT_SOUND ( 1011 )
-
 //=========================================================
 // Gonome's guts projectile
 //=========================================================
@@ -470,11 +468,6 @@ void CGonome::HandleAnimEvent(MonsterEvent_t *pEvent)
 {
 	switch (pEvent->event)
 	{
-	case GONOME_SCRIPT_EVENT_SOUND:
-		// HACK: prevent playing the sound twice
-		if (m_Activity != ACT_MELEE_ATTACK1)
-			EmitSound( CHAN_BODY, pEvent->options, 1, ATTN_NORM);
-		break;
 	case GONOME_AE_SPIT:
 	{
 		Vector vecArmPos, vecArmAng;

diff --git a/dlls/schedule.cpp b/dlls/schedule.cpp
@@ -357,6 +357,8 @@ void CBaseMonster::MaintainSchedule( void )
 	}
 }
 
+extern cvar_t anim_attack_reset_fix;
+
 //=========================================================
 // RunTask 
 //=========================================================
@@ -566,6 +568,8 @@ void CBaseMonster::RunTask( Task_t *pTask )
 			if( m_fSequenceFinished )
 			{
 				m_Activity = ACT_RESET;
+				if (anim_attack_reset_fix.value)
+					m_IdealActivity = ACT_RESET;
 				TaskComplete();
 			}
 			break;
@@ -584,6 +588,8 @@ void CBaseMonster::RunTask( Task_t *pTask )
 			if( m_fSequenceFinished )
 			{
 				m_Activity = ACT_RESET;
+				if (anim_attack_reset_fix.value)
+					m_IdealActivity = ACT_RESET;
 				TaskComplete();
 			}
 			break;