Fixed a crash when npc_helicopter that is awaiting input is killed (#419)

Wikot235 · web-flow · commit 41945409d890 · 2025-05-25T11:08:41.000-05:00
diff --git a/sp/src/game/server/hl2/npc_attackchopper.cpp b/sp/src/game/server/hl2/npc_attackchopper.cpp
@@ -4055,9 +4055,12 @@ void CNPC_AttackHelicopter::Event_Killed( const CTakeDamageInfo &info )
 	}
 
 	m_lifeState			= LIFE_DYING;
-
-	CSoundEnvelopeController &controller = CSoundEnvelopeController::GetController();
-	controller.SoundChangeVolume( m_pGunFiringSound, 0.0, 0.1f );
+	
+	if ( GetSleepState() != AISS_WAITING_FOR_INPUT )
+	{
+		CSoundEnvelopeController& controller = CSoundEnvelopeController::GetController();
+		controller.SoundChangeVolume( m_pGunFiringSound, 0.0, 0.1f );
+	}
 
 	if( GetCrashPoint() == NULL )
 	{

Original file line number	Diff line number	Diff line change
`@@ -4055,9 +4055,12 @@ void CNPC_AttackHelicopter::Event_Killed( const CTakeDamageInfo &info )`
`4055`	`4055`	`}`
`4056`	`4056`
`4057`	`4057`	`m_lifeState = LIFE_DYING;`
`4058`		`-`
`4059`		`- CSoundEnvelopeController &controller = CSoundEnvelopeController::GetController();`
`4060`		`- controller.SoundChangeVolume( m_pGunFiringSound, 0.0, 0.1f );`
	`4058`	`+`
	`4059`	`+ if ( GetSleepState() != AISS_WAITING_FOR_INPUT )`
	`4060`	`+ {`
	`4061`	`+ CSoundEnvelopeController& controller = CSoundEnvelopeController::GetController();`
	`4062`	`+ controller.SoundChangeVolume( m_pGunFiringSound, 0.0, 0.1f );`
	`4063`	`+ }`
`4061`	`4064`
`4062`	`4065`	`if( GetCrashPoint() == NULL )`
`4063`	`4066`	`{`