diff options
Diffstat (limited to 'mp/src/game/server/trigger_area_capture.cpp')
| -rw-r--r-- | mp/src/game/server/trigger_area_capture.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mp/src/game/server/trigger_area_capture.cpp b/mp/src/game/server/trigger_area_capture.cpp index 648a3b86..979ef4bc 100644 --- a/mp/src/game/server/trigger_area_capture.cpp +++ b/mp/src/game/server/trigger_area_capture.cpp @@ -535,7 +535,7 @@ void CTriggerAreaCapture::CaptureThink( void ) if ( !bRepeatBlocker ) { - m_hPoint->CaptureBlocked( pBlockingPlayer ); + m_hPoint->CaptureBlocked( pBlockingPlayer, NULL ); // Add this guy to our blocker list int iNew = m_Blockers.AddToTail(); @@ -882,6 +882,12 @@ void CTriggerAreaCapture::EndCapture( int team ) m_nCapturingTeam = TEAM_UNASSIGNED; SetCapTimeRemaining( 0 ); + // play any special cap sounds. need to do this before we update the owner of the point. + if ( TeamplayRoundBasedRules() ) + { + TeamplayRoundBasedRules()->PlaySpecialCapSounds( m_nOwningTeam, m_hPoint.Get() ); + } + //there may have been more than one capper, but only report this one. //he hasn't gotten points yet, and his name will go in the cap string if its needed //first capper gets name sent and points given by flag. @@ -912,12 +918,6 @@ void CTriggerAreaCapture::EndCapture( int team ) } } } - - // play any special cap sounds - if ( TeamplayRoundBasedRules() ) - { - TeamplayRoundBasedRules()->PlaySpecialCapSounds( m_nOwningTeam ); - } } //----------------------------------------------------------------------------- @@ -1140,7 +1140,7 @@ bool CTriggerAreaCapture::CheckIfDeathCausesBlock( CBaseMultiplayerPlayer *pVict if ( bBreakCap ) { - m_hPoint->CaptureBlocked( pKiller ); + m_hPoint->CaptureBlocked( pKiller, pVictim ); //BreakCapture( true ); } |