yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-25 22:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename the 'ogg volume' functions to 'ogg enable'

Browse source 
These functions never set the OGG volume, the just enables or disabled
OGG playback. Rename them to match their purpose.
This commit is contained in:
Yamagi Burmeister 2014-10-25 09:40:13 +02:00
parent 4d5cb5686d
commit 47634e64e8
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/client/menu/menu.c
View file

@ -992,7 +992,7 @@ static menulist_s s_options_enablecd_box;
static menulist_s s_options_cdshuffle_box; static menulist_s s_options_cdshuffle_box;
#endif #endif
#ifdef OGG #ifdef OGG
static menulist_s s_options_oggvolume_box; static menulist_s s_options_enableogg_box;
#endif #endif
static menulist_s s_options_quality_list; static menulist_s s_options_quality_list;
static menulist_s s_options_console_action; static menulist_s s_options_console_action;
@ -1057,7 +1057,7 @@ ControlsSetMenuItemValues(void)
#endif #endif
#ifdef OGG #ifdef OGG
s_options_oggvolume_box.curvalue = (Cvar_VariableValue("ogg_enable") != 0); s_options_enableogg_box.curvalue = (Cvar_VariableValue("ogg_enable") != 0);
cvar_t *ogg; cvar_t *ogg;
ogg = Cvar_Get("ogg_sequence", "loop", CVAR_ARCHIVE); ogg = Cvar_Get("ogg_sequence", "loop", CVAR_ARCHIVE);
@ -1203,14 +1203,14 @@ EnableCDMusic(void *unused)
#ifdef OGG #ifdef OGG
static void static void
UpdateOGGVolumeFunc(void *unused) EnableOGGMusic(void *unused)
{ {
Cvar_SetValue("ogg_enable", (float)s_options_oggvolume_box.curvalue); Cvar_SetValue("ogg_enable", (float)s_options_enableogg_box.curvalue);
#ifdef CDA #ifdef CDA
Cvar_SetValue("cd_nocd", 1); Cvar_SetValue("cd_nocd", 1);
#endif #endif
if (s_options_oggvolume_box.curvalue) if (s_options_enableogg_box.curvalue)
{ {
#ifdef CDA #ifdef CDA
CDAudio_Stop(); CDAudio_Stop();
@ -1364,12 +1364,12 @@ Options_MenuInit(void)
#endif #endif
#ifdef OGG #ifdef OGG
s_options_oggvolume_box.generic.type = MTYPE_SPINCONTROL; s_options_enableogg_box.generic.type = MTYPE_SPINCONTROL;
s_options_oggvolume_box.generic.x = 0; s_options_enableogg_box.generic.x = 0;
s_options_oggvolume_box.generic.y = 20; s_options_enableogg_box.generic.y = 20;
s_options_oggvolume_box.generic.name = "OGG music"; s_options_enableogg_box.generic.name = "OGG music";
s_options_oggvolume_box.generic.callback = UpdateOGGVolumeFunc; s_options_enableogg_box.generic.callback = EnableOGGMusic;
s_options_oggvolume_box.itemnames = ogg_music_items; s_options_enableogg_box.itemnames = ogg_music_items;
#endif #endif
#if defined(OGG) || defined(CDA) #if defined(OGG) || defined(CDA)
@ -1463,7 +1463,7 @@ Options_MenuInit(void)
Menu_AddItem(&s_options_menu, (void *)&s_options_enablecd_box); Menu_AddItem(&s_options_menu, (void *)&s_options_enablecd_box);
#endif #endif
#ifdef OGG #ifdef OGG
Menu_AddItem(&s_options_menu, (void *)&s_options_oggvolume_box); Menu_AddItem(&s_options_menu, (void *)&s_options_enableogg_box);
#endif #endif
#if defined(OGG) || defined(CDA) #if defined(OGG) || defined(CDA)
Menu_AddItem(&s_options_menu, (void *)&s_options_cdshuffle_box); Menu_AddItem(&s_options_menu, (void *)&s_options_cdshuffle_box);