From 4ae9719b74939039c7382eb2ccf3a03d45b1758f Mon Sep 17 00:00:00 2001 From: SanyaSho Date: Wed, 3 Aug 2022 17:34:05 +0300 Subject: [PATCH] game: restore combine ability to play pain sounds --- game/server/hl2/npc_combine.cpp | 2 +- game/server/hl2/npc_combine.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/game/server/hl2/npc_combine.cpp b/game/server/hl2/npc_combine.cpp index 09cae88ac3..afd1f8e265 100644 --- a/game/server/hl2/npc_combine.cpp +++ b/game/server/hl2/npc_combine.cpp @@ -2565,7 +2565,7 @@ void CNPC_Combine::SpeakSentence( int sentenceType ) //========================================================= // PainSound //========================================================= -void CNPC_Combine::PainSound ( void ) +void CNPC_Combine::PainSound ( const CTakeDamageInfo &damageinfo ) { // NOTE: The response system deals with this at the moment if ( GetFlags() & FL_DISSOLVING ) diff --git a/game/server/hl2/npc_combine.h b/game/server/hl2/npc_combine.h index ab166723ce..3cbea2a764 100644 --- a/game/server/hl2/npc_combine.h +++ b/game/server/hl2/npc_combine.h @@ -126,7 +126,7 @@ public: // Sounds // ------------- void DeathSound( void ); - void PainSound( void ); + void PainSound( const CTakeDamageInfo &damageinfo ); void IdleSound( void ); void AlertSound( void ); void LostEnemySound( void );