diff options
author | Simon Howard | 2011-03-07 00:01:40 +0000 |
---|---|---|
committer | Simon Howard | 2011-03-07 00:01:40 +0000 |
commit | 4755980aed7173227e876602ce78cf31bbb97118 (patch) | |
tree | 62ecc44a3cad9ecae44f252d8da5e68ca1de701e /src/setup/sound.c | |
parent | 43e82bdf93c0c3971767a63072db5b0080c2f6c6 (diff) | |
download | chocolate-doom-4755980aed7173227e876602ce78cf31bbb97118.tar.gz chocolate-doom-4755980aed7173227e876602ce78cf31bbb97118.tar.bz2 chocolate-doom-4755980aed7173227e876602ce78cf31bbb97118.zip |
Update config variable binding in setup tool so that the correct
variables are bound for Strife. Add option for show_talk to sound
configuration screen.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2296
Diffstat (limited to 'src/setup/sound.c')
-rw-r--r-- | src/setup/sound.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/setup/sound.c b/src/setup/sound.c index d8dc129e..4564aeb4 100644 --- a/src/setup/sound.c +++ b/src/setup/sound.c @@ -75,6 +75,7 @@ static int numChannels = 8; static int sfxVolume = 15; static int musicVolume = 15; static int voiceVolume = 15; +static int show_talk = 0; static int use_libsamplerate = 0; // DOS specific variables: these are unused but should be maintained @@ -196,8 +197,6 @@ void ConfigSound(void) TXT_AddWidgets(window, TXT_NewSeparator("Sound effects"), sfx_table = TXT_NewTable(2), - TXT_NewSeparator("Music"), - music_table = TXT_NewTable(2), NULL); TXT_SetColumnWidths(sfx_table, 20, 14); @@ -219,8 +218,15 @@ void ConfigSound(void) TXT_NewLabel("Voice volume"), TXT_NewSpinControl(&voiceVolume, 0, 15), NULL); + TXT_AddWidget(window, + TXT_NewCheckBox("Show text with voices", &show_talk)); } + TXT_AddWidgets(window, + TXT_NewSeparator("Music"), + music_table = TXT_NewTable(2), + NULL); + TXT_SetColumnWidths(music_table, 20, 14); TXT_AddWidgets(music_table, @@ -253,7 +259,8 @@ void BindSoundVariables(void) if (gamemission == strife) { - M_BindVariable("voice_volume", &voiceVolume); + M_BindVariable("voice_volume", &voiceVolume); + M_BindVariable("show_talk", &show_talk); } // Before SDL_mixer version 1.2.11, MIDI music caused the game |