adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize music volume throughout (bug #718)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1638 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-04-17 17:35:39 +00:00
parent 9766ee17d2
commit b63ed062d8
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm.c
+4 -3
View File
@@ -53,8 +53,9 @@ static BOOLEAN getLineWithinWidth(TEXT *pText,
const unsigned char **startNext, SIZE maxWidth, COUNT maxChars); const unsigned char **startNext, SIZE maxWidth, COUNT maxChars);
#define MAX_RESPONSES 8 #define MAX_RESPONSES 8
#define BACKGROUND_VOL speechVolumeScale == 0.0f ? MAX_VOLUME : (MAX_VOLUME >> 1) #define BACKGROUND_VOL \
#define FOREGROUND_VOL MAX_VOLUME (speechVolumeScale == 0.0f ? NORMAL_VOLUME : (NORMAL_VOLUME >> 1))
#define FOREGROUND_VOL NORMAL_VOLUME
#define SLIDER_Y 107 #define SLIDER_Y 107
#define SLIDER_HEIGHT 15 #define SLIDER_HEIGHT 15
@@ -1913,7 +1914,7 @@ DoCommunication (PENCOUNTER_STATE pES)
StopMusic (); StopMusic ();
StopSound (); StopSound ();
StopTrack (); StopTrack ();
SleepThreadUntil (FadeMusic (FOREGROUND_VOL, 0) + ONE_SECOND / 60); SleepThreadUntil (FadeMusic (NORMAL_VOLUME, 0) + ONE_SECOND / 60);
return (FALSE); return (FALSE);
} }
sc2/src/sc2code/gameopt.c
+1 -1
View File
@@ -1007,7 +1007,7 @@ DoPickGame (PMENU_STATE pMS)
pMS->CurFrame = 0; pMS->CurFrame = 0;
PauseMusic (); PauseMusic ();
StopSound (); StopSound ();
FadeMusic (128, 0); FadeMusic (NORMAL_VOLUME, 0);
{ {
extern FRAME PlayFrame; extern FRAME PlayFrame;
sc2/src/sc2code/libs/sndlib.h
+1
View File
@@ -59,6 +59,7 @@ extern BOOLEAN DestroyMusic (MUSIC_REF MusicRef);
#define MAX_CHANNELS 8 #define MAX_CHANNELS 8
#define MAX_VOLUME 255 #define MAX_VOLUME 255
#define NORMAL_VOLUME 160
#define FIRST_SFX_CHANNEL 0 #define FIRST_SFX_CHANNEL 0
#define MIN_FX_CHANNEL 1 #define MIN_FX_CHANNEL 1
sc2/src/sc2code/libs/sound/sound.c
+1 -1
View File
@@ -24,7 +24,7 @@ static Task FadeTask;
static SIZE TTotal; static SIZE TTotal;
static SIZE volume_end; static SIZE volume_end;
int musicVolume = (MAX_VOLUME >> 1); int musicVolume = NORMAL_VOLUME;
float musicVolumeScale; float musicVolumeScale;
float sfxVolumeScale; float sfxVolumeScale;
float speechVolumeScale; float speechVolumeScale;