From 72e225f8c9afae5e4bba09b25a3d96b7e4c9918b Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 7 Aug 2020 12:43:59 -0700 Subject: [PATCH] Rename digmusicvolume to musicvolume, default soundvolume and musicvolume to 100% --- src/doomdef.h | 1 + src/s_sound.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index ec887b075..d84aaa4e9 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -675,5 +675,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch; /// Divide volume of music and sounds by this much (loudest sounds on earth) #define VOLUME_DIVIDER 4 +#define MAX_VOLUME ( 100 * VOLUME_DIVIDER ) #endif // __DOOMDEF__ diff --git a/src/s_sound.c b/src/s_sound.c index 790468284..ec1f53e1f 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -49,7 +49,7 @@ extern INT32 msg_id; static INT32 S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, INT32 *pitch, sfxinfo_t *sfxinfo); #endif -CV_PossibleValue_t soundvolume_cons_t[] = {{0, "MIN"}, {31, "MAX"}, {0, NULL}}; +CV_PossibleValue_t soundvolume_cons_t[] = {{0, "MIN"}, {MAX_VOLUME, "MAX"}, {0, NULL}}; static void SetChannelsNum(void); static void Command_Tunes_f(void); static void Command_RestartAudio_f(void); @@ -92,8 +92,8 @@ consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, N static consvar_t precachesound = {"precachesound", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // actual general (maximum) sound & music volume, saved into the config -consvar_t cv_soundvolume = {"soundvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_digmusicvolume = {"digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_soundvolume = {"soundvolume", "100", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_digmusicvolume = {"musicvolume", "100", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // number of channels available #if defined (_WIN32_WCE) || defined (DC) || defined (PSP) || defined(GP2X) consvar_t cv_numChannels = {"snd_channels", "8", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL}; @@ -121,8 +121,6 @@ consvar_t cv_music_resync_threshold = {"music_resync_threshold", "100", CV_SAVE| consvar_t cv_music_resync_powerups_only = {"music_resync_powerups_only", "No", CV_SAVE|CV_CALL, CV_YesNo, I_UpdateSongLagConditions, 0, NULL, NULL, 0, 0, NULL}; -#define S_MAX_VOLUME 127 - // when to clip out sounds // Does not fit the large outdoor areas. // added 2-2-98 in 8 bit volume control (before (1200*0x10000))