--- C:\Users\Chris\Desktop\jeff\Gunz1.5\Stable\Gunz\ZEffectFlashBang.cpp
+++ C:\Users\Chris\Desktop\rg\Gunz1.5\Stable\Gunz\ZEffectFlashBang.cpp
@@ -228,7 +228,7 @@
SAFE_RELEASE( mpHoldBackBuffer );
}
-
+ ZGetFlashBangEffect()->PlaySound();
}
//////////////////////////////////////////////////////////////////////////
@@ -276,7 +276,6 @@
RGetDevice()->DrawPrimitiveUP( D3DPT_TRIANGLEFAN, 2, mBuffer, sizeof(RTLVertex) );
RGetDevice()->SetRenderState( D3DRS_ZENABLE, dw );
- PlaySound();
}
else
End();
@@ -304,94 +303,15 @@
//////////////////////////////////////////////////////////////////////////
void ZEffectFlashBang::PlaySound()
{
-#ifdef _BIRDSOUND
- return;
-#else
- FSOUND_SAMPLE* pFS = ZGetSoundEngine()->GetFS("fx_flashbang", true);
-
- if( pFS == NULL )
- {
- return;
- }
-
- //float volumn;
- float restDuration = mfDuration - ( ZGetGame()->GetTime() - mfStartTime );
-
- //volumn = MAX_MUSIC_VOLUMN * ( 1.0f / (restDuration*restDuration) ) + MIN_VOLUMN;
- //volumn = max( min( MAX_MUSIC_VOLUMN, volumn ), 0.01f );
- //ZGetSoundEngine()->SetMusicVolume( volumn );
- //volumn = MAX_EFFECT_VOLUMN * ( 1.0f / (restDuration*restDuration) ) + MIN_VOLUMN;
- //volumn = max( min( MAX_EFFECT_VOLUMN, volumn ), 0.01f );
- //ZGetSoundEngine()->SetEffectVolume( volumn );
-
- static int stage = 0;
-
- switch(stage)
- {
- case 0:
- if( restDuration >= 5 )
- {
- ZGetSoundEngine()->SetEffectVolume( 0.2 );
- ZGetSoundEngine()->SetMusicVolume( 0.2 );
- stage = 1;
- }
- break;
- case 1:
- if( restDuration < 5 )
- {
- ZGetSoundEngine()->SetEffectVolume( 0.4 * Z_AUDIO_EFFECT_VOLUME );
- ZGetSoundEngine()->SetMusicVolume( 0.4 * Z_AUDIO_BGM_VOLUME );
- stage = 2;
- }
- break;
- case 2:
- if( restDuration < 4 )
- {
- ZGetSoundEngine()->SetEffectVolume( 0.6 * Z_AUDIO_EFFECT_VOLUME );
- ZGetSoundEngine()->SetMusicVolume( 0.6 * Z_AUDIO_BGM_VOLUME );
- stage = 3;
- }
- break;
- case 3:
- if( restDuration < 3 )
- {
- ZGetSoundEngine()->SetEffectVolume( 0.8 * Z_AUDIO_EFFECT_VOLUME );
- ZGetSoundEngine()->SetMusicVolume( 0.8 * Z_AUDIO_BGM_VOLUME );
- stage = 4;
- }
- break;
- case 4:
- if( restDuration < 2 )
- {
- ZGetSoundEngine()->SetEffectVolume( 0.9 * Z_AUDIO_EFFECT_VOLUME );
- ZGetSoundEngine()->SetMusicVolume( 0.9 * Z_AUDIO_BGM_VOLUME );
- stage = 5;
- }
- break;
- case 5:
- if( restDuration < 1 )
- {
- ZGetSoundEngine()->SetEffectVolume( Z_AUDIO_EFFECT_VOLUME );
- ZGetSoundEngine()->SetMusicVolume( Z_AUDIO_BGM_VOLUME );
- stage = 0;
- }
- break;
- }
-
- if( mbInitialSound && pFS != NULL )
- {
- m_iChannel = ZGetSoundEngine()->PlaySE( pFS, rvector(0,0,0), 200, false, true );
- mbInitialSound = false;
- if( m_iChannel == -1 ) return;
- ZGetSoundEngine()->SetEffectVolume( m_iChannel, MAX_EFFECT_VOLUMN );
- }
- else if( m_iChannel != -1 )
- {
- mfVolumn = MAX_EFFECT_VOLUMN *1.5* restDuration / mfDuration;
- mfVolumn = max( min( 1.0f, mfVolumn ), 0.f );
- ZGetSoundEngine()->SetEffectVolume( m_iChannel, mfVolumn );
- }
-#endif
+ FSOUND_SAMPLE* pFS = ZGetSoundEngine()->GetFS("we_grenade_fire", true);
+
+ if (pFS != nullptr)
+ {
+ m_iChannel = ZGetSoundEngine()->PlaySE(pFS, rvector(0, 0, 0), 200, false, true);
+ mbInitialSound = false;
+ if (m_iChannel == -1) return;
+ ZGetSoundEngine()->SetEffectVolume(m_iChannel, MAX_EFFECT_VOLUMN);
+ }
}
//////////////////////////////////////////////////////////////////////////