mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Little Alien
Play weapon sounds on higher volume Adjustable in ja2.ini git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@53 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+32
-7
@@ -19,6 +19,8 @@ UINT32 MIDVOLUME START_MIDVOLUME;
|
||||
UINT32 HIGHVOLUME START_HIGHVOLUME;
|
||||
*/
|
||||
|
||||
extern UINT32 guiWeaponSoundEffectsVolume;
|
||||
|
||||
UINT32 guiSpeechVolume = MIDVOLUME;
|
||||
UINT32 guiSoundEffectsVolume = MIDVOLUME;
|
||||
|
||||
@@ -437,17 +439,30 @@ BOOLEAN ShutdownJA2Sound( )
|
||||
|
||||
UINT32 PlayJA2Sample( UINT32 usNum, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan )
|
||||
{
|
||||
SOUNDPARMS spParms;
|
||||
//SoundLog((CHAR8 *)String(" Play sound %s on volume %d", szSoundEffects[usNum], ubVolume));
|
||||
|
||||
SOUNDPARMS spParms;
|
||||
|
||||
memset(&spParms, 0xff, sizeof(SOUNDPARMS));
|
||||
|
||||
spParms.uiSpeed = usRate;
|
||||
spParms.uiVolume = CalculateSoundEffectsVolume( ubVolume );
|
||||
spParms.uiVolume &= 0xFFL;
|
||||
|
||||
if ( strstr( szSoundEffects[usNum], "WEAPONS" ) == NULL )
|
||||
{
|
||||
spParms.uiVolume = CalculateSoundEffectsVolume( ubVolume );
|
||||
}
|
||||
else
|
||||
{
|
||||
spParms.uiVolume = (UINT32)( ( ubVolume / (FLOAT) HIGHVOLUME ) * guiSoundEffectsVolume +.5 ) * (1 + guiWeaponSoundEffectsVolume / 100);
|
||||
}
|
||||
|
||||
spParms.uiVolume &= 0xFFL;
|
||||
spParms.uiLoop = ubLoops;
|
||||
spParms.uiPan = uiPan & 0xFFL;
|
||||
spParms.uiPriority=GROUP_PLAYER;
|
||||
|
||||
//SoundLog((CHAR8 *)String(" Play sound %s on volume %d", szSoundEffects[usNum], spParms.uiVolume));
|
||||
|
||||
return(SoundPlay(szSoundEffects[usNum], &spParms));
|
||||
}
|
||||
|
||||
@@ -470,20 +485,30 @@ UINT32 PlayJA2StreamingSample( UINT32 usNum, UINT32 usRate, UINT32 ubVolume, UIN
|
||||
|
||||
UINT32 PlayJA2SampleFromFile( STR8 szFileName, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan )
|
||||
{
|
||||
|
||||
//SoundLog((CHAR8 *)String(" Play sound %s on volume %d", szFileName, ubVolume));
|
||||
// does the same thing as PlayJA2Sound, but one only has to pass the filename, not the index of the sound array
|
||||
|
||||
SOUNDPARMS spParms;
|
||||
SOUNDPARMS spParms;
|
||||
|
||||
memset(&spParms, 0xff, sizeof(SOUNDPARMS));
|
||||
|
||||
spParms.uiSpeed = usRate;
|
||||
spParms.uiVolume = CalculateSoundEffectsVolume( ubVolume );
|
||||
|
||||
if ( strstr( szFileName, "WEAPONS" ) == NULL )
|
||||
{
|
||||
spParms.uiVolume = CalculateSoundEffectsVolume( ubVolume );
|
||||
}
|
||||
else
|
||||
{
|
||||
spParms.uiVolume = (UINT32)( ( ubVolume / (FLOAT) HIGHVOLUME ) * guiSoundEffectsVolume +.5 ) * (1 + guiWeaponSoundEffectsVolume / 100);
|
||||
}
|
||||
|
||||
spParms.uiLoop = ubLoops;
|
||||
spParms.uiPan = uiPan;
|
||||
spParms.uiPriority=GROUP_PLAYER;
|
||||
|
||||
//return(SoundPlay(szFileName, &spParms));
|
||||
//SoundLog((CHAR8 *)String(" Play sound %s on volume %d", szFileName, spParms.uiVolume));
|
||||
|
||||
return(SoundPlay((STR) szFileName, &spParms));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user