Skip to content

Commit

Permalink
various settings menu improvements
Browse files Browse the repository at this point in the history 
Add support for quit bind, minimize bind, draw timer, and draw fps options.
  • Loading branch information
@Chomenor
Chomenor committed Dec 29, 2021
1 parent b27dc79 commit a9487d0
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 13 deletions.
36 changes: 30 additions & 6 deletions code/ui/ui_atoms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2065,6 +2065,8 @@ void UI_LoadMenuText()
menu_normal_text[MNT_IGNORES_TITLE] = "ELITE FORCE HOLOMATCH : IGNORED PLAYERS";
menu_normal_text[MNT_IGNORES] = "IGNORED PLAYERS";
menu_normal_text[MNT_IGNORES_PLAYERLIST] = "PLAYERLIST";
menu_normal_text[MNT_SHORTCUT_QUIT] = "QUIT";
menu_normal_text[MNT_SHORTCUT_MINIMIZE] = "MINIMIZE";
menu_normal_text[MNT_BROWSER_PLAYER_COUNT] = "PLAYER COUNT";
menu_normal_text[MNT_BROWSER_HUMANS_ONLY] = "HUMAN PLAYERS ONLY";
menu_normal_text[MNT_BROWSER_BOTS_AND_HUMANS] = "BOTS OR HUMANS";
Expand Down Expand Up @@ -2093,6 +2095,8 @@ void UI_LoadMenuText()
menu_normal_text[MNT_IGNORES_TITLE] = "ELITE FORCE HOLOMATCH: IGNORIERTE SPIELER";
menu_normal_text[MNT_IGNORES] = "IGNORIERTE SPIELER";
menu_normal_text[MNT_IGNORES_PLAYERLIST] = "SPIELERLISTE";
menu_normal_text[MNT_SHORTCUT_QUIT] = "VERLASSEN";
menu_normal_text[MNT_SHORTCUT_MINIMIZE] = "MINIMIEREN";
menu_normal_text[MNT_BROWSER_PLAYER_COUNT] = "SPIELERZAHL";
menu_normal_text[MNT_BROWSER_HUMANS_ONLY] = "NUR MENSCHLICHE SPIELER";
menu_normal_text[MNT_BROWSER_BOTS_AND_HUMANS] = "BOTS ODER MENSCHEN";
Expand Down Expand Up @@ -2129,6 +2133,8 @@ void UI_LoadMenuText()
menu_normal_text[MNT_IGNORES_TITLE] = "ELITE FORCE HOLOMATCH : JOUEURS IGNOREE";
menu_normal_text[MNT_IGNORES] = "JOUEURS IGNOREE";
menu_normal_text[MNT_IGNORES_PLAYERLIST] = "LISTE DES JOUEURS";
menu_normal_text[MNT_SHORTCUT_QUIT] = "QUITTER";
menu_normal_text[MNT_SHORTCUT_MINIMIZE] = "MINIMISER";
menu_normal_text[MNT_BROWSER_PLAYER_COUNT] = "NOMBRE DE JOUEURS";
menu_normal_text[MNT_BROWSER_HUMANS_ONLY] = "JOUEURS HUMAINS UNIQUEMENT";
menu_normal_text[MNT_BROWSER_BOTS_AND_HUMANS] = "BOTS OU HUMAINS";
Expand Down Expand Up @@ -2268,6 +2274,10 @@ void UI_LoadButtonText()
menu_button_text[MBT_REMOVE_IGNORE][1] = "REMOVE IGNORE";
menu_button_text[MBT_FLUSH_IGNORE][0] = "CLEAR";
menu_button_text[MBT_FLUSH_IGNORE][1] = "REMOVE ALL IGNORES";
menu_button_text[MBT_DRAW_TIMER][0] = "DRAW TIMER";
menu_button_text[MBT_DRAW_TIMER][1] = "DRAW TIME REMAINING IN MATCH";
menu_button_text[MBT_DRAW_FPS][0] = "DRAW FPS";
menu_button_text[MBT_DRAW_FPS][1] = "DRAW CURRENT FRAMERATE";
menu_button_text[MBT_FOV][0] = "FIELD OF VIEW";
menu_button_text[MBT_FOV][1] = "ADJUST FIELD OF VIEW";
menu_button_text[MBT_ASPECTCORRECTION][0] = "ASPECT CORRECTION";
Expand All @@ -2278,8 +2288,10 @@ void UI_LoadButtonText()
menu_button_text[MBT_BROWSER_PLAYERTYPE][1] = "FILTER BY AMOUNT OF PLAYERS ON SERVER";
menu_button_text[MBT_SOUND_OPENAL][0] = "OPENAL";
menu_button_text[MBT_SOUND_OPENAL][1] = "OPENAL SOUND ON/OFF.";
menu_button_text[MBT_SOUND_OVERALL_VOLUME][0] = "OVERALL VOLUME";
menu_button_text[MBT_SOUND_OVERALL_VOLUME][1] = "VOLUME FOR ALL IN-GAME AUDIO.";
menu_button_text[MBT_SOUND_GENERAL_VOLUME][0] = "GENERAL VOLUME";
menu_button_text[MBT_SOUND_GENERAL_VOLUME][1] = "VOLUME FOR ALL IN-GAME AUDIO.";
menu_button_text[MBT_CONTROLS_MISC][0] = "MISC";
menu_button_text[MBT_CONTROLS_MISC][1] = "CONFIGURE COMMAND KEYS";
menu_button_text[MBT_CONTROLS_RAW_MOUSE][0] = "RAW MOUSE";
menu_button_text[MBT_CONTROLS_RAW_MOUSE][1] = "RAW MOUSE INPUT (ON/OFF)";
menu_button_text[MBT_VIDEO_LIGHTING_LEVEL][0] = "LIGHTING LEVEL";
Expand Down Expand Up @@ -2337,6 +2349,10 @@ void UI_LoadButtonText()
menu_button_text[MBT_REMOVE_IGNORE][1] = "IGNORE AUFHEBEN";
menu_button_text[MBT_FLUSH_IGNORE][0] = "ALLE LÖSCHEN";
menu_button_text[MBT_FLUSH_IGNORE][1] = "ALLE IGNORES ENTFERNEN";
menu_button_text[MBT_DRAW_TIMER][0] = "TIMER ANZEIGEN";
menu_button_text[MBT_DRAW_TIMER][1] = "VERBLEIBENDE ZEIT IM SPIEL ANZEIGEN";
menu_button_text[MBT_DRAW_FPS][0] = "FPS ANZEIGEN";
menu_button_text[MBT_DRAW_FPS][1] = "AKTUELLE FPS ANZEIGEN";
menu_button_text[MBT_FOV][0] = "SICHTFELD";
menu_button_text[MBT_FOV][1] = "SICHTFELD ANPASSEN";
menu_button_text[MBT_ASPECTCORRECTION][0] = "ASPEKTKORREKTUR";
Expand All @@ -2346,8 +2362,10 @@ void UI_LoadButtonText()
menu_button_text[MBT_BROWSER_PLAYERTYPE][0] = "SPIELERTYP";
menu_button_text[MBT_BROWSER_PLAYERTYPE][1] = "FILTER NACH ANZAHL DER SPIELER AUF DEM SERVER";
menu_button_text[MBT_SOUND_OPENAL][1] = "OPENAL-SOUND EIN/AUS";
menu_button_text[MBT_SOUND_OVERALL_VOLUME][0] = "GESAMTLAUTSTÄRKE";
menu_button_text[MBT_SOUND_OVERALL_VOLUME][1] = "LAUTSTÄRKE FÜR ALLE IN-GAME-AUDIO.";
menu_button_text[MBT_SOUND_GENERAL_VOLUME][0] = "GESAMTLAUTSTÄRKE";
menu_button_text[MBT_SOUND_GENERAL_VOLUME][1] = "LAUTSTÄRKE FÜR ALLE IN-GAME-AUDIO.";
menu_button_text[MBT_CONTROLS_MISC][0] = "SONSTIGES";
menu_button_text[MBT_CONTROLS_MISC][1] = "STEUERUNGSTASTEN KONFIGURIEREN";
menu_button_text[MBT_CONTROLS_RAW_MOUSE][0] = "ROHE MAUS";
menu_button_text[MBT_CONTROLS_RAW_MOUSE][1] = "ROHE MAUSEINGABE (EIN/AUS)";
menu_button_text[MBT_VIDEO_LIGHTING_LEVEL][0] = "BELEUCHTUNGSNIVEAU";
Expand Down Expand Up @@ -2415,6 +2433,10 @@ void UI_LoadButtonText()
menu_button_text[MBT_REMOVE_IGNORE][1] = "SUPPRIMER L'IGNORE";
menu_button_text[MBT_FLUSH_IGNORE][0] = "SUPPR. TOUS";
menu_button_text[MBT_FLUSH_IGNORE][1] = "VIDER LA LISTE DES JOUEURS IGNOREE";
menu_button_text[MBT_DRAW_TIMER][0] = "AFFICHER LA MINUTERIE";
menu_button_text[MBT_DRAW_TIMER][1] = "AFFICHER LE TEMPS RESTANT DANS LE MATCH";
menu_button_text[MBT_DRAW_FPS][0] = "AFFICHER FPS";
menu_button_text[MBT_DRAW_FPS][1] = "AFFICHER LES IMAGES ACTUELLES PAR SECONDE";
menu_button_text[MBT_FOV][0] = "CHAMP DE VISION";
menu_button_text[MBT_FOV][1] = "AJUSTER LE CHAMP DE VISION";
menu_button_text[MBT_ASPECTCORRECTION][0] = "CORRECTION D'ASPECT";
Expand All @@ -2424,8 +2446,10 @@ void UI_LoadButtonText()
menu_button_text[MBT_BROWSER_PLAYERTYPE][0] = "TYPE DE JOUEUR";
menu_button_text[MBT_BROWSER_PLAYERTYPE][1] = "FILTREZ PAR QUANTITÉ DE JOUEURS SUR SERVEUR";
menu_button_text[MBT_SOUND_OPENAL][1] = "SON OPENAL ON/OFF";
menu_button_text[MBT_SOUND_OVERALL_VOLUME][0] = "VOLUME GLOBAL";
menu_button_text[MBT_SOUND_OVERALL_VOLUME][1] = "VOLUME POUR TOUS LES AUDIO DU JEU.";
menu_button_text[MBT_SOUND_GENERAL_VOLUME][0] = "VOLUME GÉNÉRAL";
menu_button_text[MBT_SOUND_GENERAL_VOLUME][1] = "VOLUME POUR TOUS LES AUDIO DU JEU.";
menu_button_text[MBT_CONTROLS_MISC][0] = "DIVERS";
menu_button_text[MBT_CONTROLS_MISC][1] = "CONFIGURER TOUCHES DE COMMANDE";
menu_button_text[MBT_CONTROLS_RAW_MOUSE][0] = "SOURIS RAW";
menu_button_text[MBT_CONTROLS_RAW_MOUSE][1] = "ENTREE RAW SOURIS (ON/OFF)";
menu_button_text[MBT_VIDEO_LIGHTING_LEVEL][0] = "NIVEAU D'ÉCLAIRAGE";
Expand Down
42 changes: 37 additions & 5 deletions code/ui/ui_controls2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "ui_local.h"

typedef struct {
qboolean supportMinimize;
qboolean supportFreeLook;
qboolean supportRawMouse;
qboolean supportMouseStrafe;
Expand All @@ -21,6 +22,10 @@ Load settings in the soundEngineConfig structure.
static void UI_InitControlsEngineConfig( void ) {
memset( &controlsEngineConfig, 0, sizeof( controlsEngineConfig ) );

if ( VMExt_GVCommandInt( "ui_support_minimize", 0 ) ) {
controlsEngineConfig.supportMinimize = qtrue;
}

if ( !VMExt_GVCommandInt( "ui_suppress_cl_freelook", 0 ) || trap_Cvar_VariableValue( "cl_freelook" ) < 1.0f ) {
controlsEngineConfig.supportFreeLook = qtrue;
}
Expand Down Expand Up @@ -798,6 +803,8 @@ typedef struct
#define ID_OBJECTIVES 36
#define ID_IGNORE 37
#define ID_UNIGNORE 38
#define ID_QUIT 39
#define ID_MINIMIZE 40

#define ID_USE 1

Expand Down Expand Up @@ -891,6 +898,8 @@ typedef struct
menuaction_s chat4;
menuaction_s ignore;
menuaction_s unignore;
menuaction_s quit;
menuaction_s minimize;
menulist_s joyenable;
menuslider_s joythreshold;
int section;
Expand Down Expand Up @@ -952,6 +961,8 @@ static bind_t g_bindings[] =
{"+analysis", MNT_SHORTCUT_OBJECTIVES, ID_OBJECTIVES, ANIM_IDLE, -1, -1, -1, -1,MNT_SHORTCUT_KEY},
{"ignore", MNT_SHORTCUT_IGNORE, ID_IGNORE, ANIM_IDLE, -1, -1, -1, -1,MNT_SHORTCUT_KEY},
{"unignore", MNT_SHORTCUT_UNIGNORE, ID_UNIGNORE, ANIM_IDLE, -1, -1, -1, -1,MNT_SHORTCUT_KEY},
{"quit", MNT_SHORTCUT_QUIT, ID_QUIT, ANIM_IDLE, -1, -1, -1, -1,MNT_SHORTCUT_KEY},
{"minimize", MNT_SHORTCUT_MINIMIZE, ID_MINIMIZE, ANIM_IDLE, -1, -1, -1, -1,MNT_SHORTCUT_KEY},
{(char*)NULL, 0, 0, 0, -1, -1, -1, -1,0},
};

Expand Down Expand Up @@ -1015,6 +1026,8 @@ static void* g_command_controls[] =
&s_controls.gesture,
&s_controls.ignore,
&s_controls.unignore,
&s_controls.quit,
&s_controls.minimize,
NULL,
};

Expand Down Expand Up @@ -2447,6 +2460,10 @@ static void SetupActionButtons_Init(int section)
break;
}

if ( !controlsEngineConfig.supportMinimize && g_section == C_COMMAND && controlptr[i] == &s_controls.minimize ) {
continue;
}

if ( !controlsEngineConfig.supportFreeLook && g_section == C_LOOK && controlptr[i] == &s_look_mouselook_action ) {
continue;
}
Expand Down Expand Up @@ -2642,6 +2659,9 @@ UI_SetupWeaponsMenu
*/
void UI_SetupWeaponsMenu( void )
{
// Entering the controls menu should always pass through this function, so perform the init here.
UI_InitControlsEngineConfig();

// if (!s_weapons_menu.initialized)
// {
Weapons_MenuInit();
Expand Down Expand Up @@ -2729,7 +2749,7 @@ static void SetupMenu_SideButtons(menuframework_s *menu,int menuType)
s_controls_command.color2 = CT_LTPURPLE1;
s_controls_command.textX = 5;
s_controls_command.textY = 1;
s_controls_command.textEnum = MBT_COMMANDKEYS;
s_controls_command.textEnum = MBT_CONTROLS_MISC;
s_controls_command.textcolor = CT_BLACK;
s_controls_command.textcolor2 = CT_WHITE;

Expand Down Expand Up @@ -3294,8 +3314,6 @@ ControlsAttackLook_MenuInit
*/
static void ControlsAttackLook_MenuInit( void )
{
UI_InitControlsEngineConfig();

s_controlslook_menu.nitems = 0;
s_controlslook_menu.wrapAround = qtrue;
s_controlslook_menu.draw = ControlsAttackLook_MenuDraw;
Expand Down Expand Up @@ -3548,8 +3566,6 @@ static void ControlsMouseJoyStick_MenuInit( void )
{
int x,y;

UI_InitControlsEngineConfig();

UI_ControlsMouseJoyStickMenu_Cache();

s_controlsmouse_menu.nitems = 0;
Expand Down Expand Up @@ -4365,6 +4381,18 @@ static void ControlsCommand_MenuInit( void )
s_controls.unignore.generic.ownerdraw = Controls_DrawKeyBinding;
s_controls.unignore.generic.id = ID_UNIGNORE;

s_controls.quit.generic.type = MTYPE_ACTION;
s_controls.quit.generic.flags = QMF_LEFT_JUSTIFY|QMF_HIGHLIGHT_IF_FOCUS;
s_controls.quit.generic.callback = Controls_ActionEvent;
s_controls.quit.generic.ownerdraw = Controls_DrawKeyBinding;
s_controls.quit.generic.id = ID_QUIT;

s_controls.minimize.generic.type = MTYPE_ACTION;
s_controls.minimize.generic.flags = QMF_LEFT_JUSTIFY|QMF_HIGHLIGHT_IF_FOCUS;
s_controls.minimize.generic.callback = Controls_ActionEvent;
s_controls.minimize.generic.ownerdraw = Controls_DrawKeyBinding;
s_controls.minimize.generic.id = ID_MINIMIZE;

s_attack_waiting_action.generic.type = MTYPE_ACTION;
s_attack_waiting_action.generic.flags = QMF_HIDDEN;
s_attack_waiting_action.generic.x = 202;
Expand Down Expand Up @@ -4392,6 +4420,10 @@ static void ControlsCommand_MenuInit( void )
Menu_AddItem( &s_controlscommand_menu, ( void * )&s_controls.gesture);
Menu_AddItem( &s_controlscommand_menu, ( void * )&s_controls.ignore);
Menu_AddItem( &s_controlscommand_menu, ( void * )&s_controls.unignore);
Menu_AddItem( &s_controlscommand_menu, ( void * )&s_controls.quit);
if ( controlsEngineConfig.supportMinimize ) {
Menu_AddItem( &s_controlscommand_menu, ( void * )&s_controls.minimize);
}
Menu_AddItem( &s_controlscommand_menu, ( void * )&s_attack_waiting_action);

// initialize the configurable cvars
Expand Down
7 changes: 6 additions & 1 deletion code/ui/ui_local.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,8 @@ typedef enum
MNT_IGNORES_TITLE,
MNT_IGNORES,
MNT_IGNORES_PLAYERLIST,
MNT_SHORTCUT_QUIT,
MNT_SHORTCUT_MINIMIZE,
MNT_BROWSER_PLAYER_COUNT,
MNT_BROWSER_HUMANS_ONLY,
MNT_BROWSER_BOTS_AND_HUMANS,
Expand Down Expand Up @@ -938,12 +940,15 @@ typedef enum
MBT_ADD_IGNORE,
MBT_REMOVE_IGNORE,
MBT_FLUSH_IGNORE,
MBT_DRAW_TIMER,
MBT_DRAW_FPS,
MBT_FOV,
MBT_ASPECTCORRECTION,
MBT_CENTERHUD,
MBT_BROWSER_PLAYERTYPE,
MBT_SOUND_OPENAL,
MBT_SOUND_OVERALL_VOLUME,
MBT_SOUND_GENERAL_VOLUME,
MBT_CONTROLS_MISC,
MBT_CONTROLS_RAW_MOUSE,
MBT_VIDEO_LIGHTING_LEVEL,
MBT_VIDEO_LIGHTING_CONTRAST,
Expand Down
50 changes: 50 additions & 0 deletions code/ui/ui_preferences.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ extern int s_OffOnNone_Names[];
#define ID_ALLOWDOWNLOAD 137
#define ID_BACK 138
#define ID_VOICELANGUAGE 139
#define ID_DRAWTIMER 140
#define ID_DRAWFPS 141



Expand All @@ -61,6 +63,8 @@ typedef struct {
menulist_s identifytarget;
menulist_s forcemodel;
menulist_s drawteamoverlay;
menulist_s drawtimer;
menulist_s drawfps;
menulist_s allowdownload;

int currentcrosshair;
Expand Down Expand Up @@ -103,6 +107,8 @@ static void Preferences_SetMenuItems( void )
// s_preferences.highqualitysky.curvalue = trap_Cvar_VariableValue ( "r_fastsky" ) == 0;
s_preferences.forcemodel.curvalue = trap_Cvar_VariableValue( "cg_forcemodel" ) != 0;
s_preferences.drawteamoverlay.curvalue = Com_Clamp( 0, 3, trap_Cvar_VariableValue( "cg_drawTeamOverlay" ) );
s_preferences.drawtimer.curvalue = trap_Cvar_VariableValue( "cg_drawTimer" ) != 0;
s_preferences.drawfps.curvalue = trap_Cvar_VariableValue( "cg_drawFPS" ) != 0;
s_preferences.allowdownload.curvalue = trap_Cvar_VariableValue( "cl_allowDownload" ) != 0;

trap_Cvar_VariableStringBuffer( "g_language", buffer, 32 );
Expand Down Expand Up @@ -184,6 +190,14 @@ static void Preferences_Event( void* ptr, int notification )
trap_Cvar_SetValue( "cg_drawTeamOverlay", s_preferences.drawteamoverlay.curvalue );
break;

case ID_DRAWTIMER:
trap_Cvar_SetValue( "cg_drawTimer", s_preferences.drawtimer.curvalue );
break;

case ID_DRAWFPS:
trap_Cvar_SetValue( "cg_drawFPS", s_preferences.drawfps.curvalue );
break;

case ID_ALLOWDOWNLOAD:
trap_Cvar_SetValue( "cl_allowDownload", s_preferences.allowdownload.curvalue );
break;
Expand Down Expand Up @@ -443,6 +457,40 @@ static void GameOptions_MenuInit( void )
s_preferences.drawteamoverlay.listnames = teamoverlay_names;
s_preferences.drawteamoverlay.width = width;

y += inc;
s_preferences.drawtimer.generic.type = MTYPE_SPINCONTROL;
s_preferences.drawtimer.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.drawtimer.generic.x = x;
s_preferences.drawtimer.generic.y = y;
s_preferences.drawtimer.generic.callback = Preferences_Event;
s_preferences.drawtimer.generic.id = ID_DRAWTIMER;
s_preferences.drawtimer.textEnum = MBT_DRAW_TIMER;
s_preferences.drawtimer.textcolor = CT_BLACK;
s_preferences.drawtimer.textcolor2 = CT_WHITE;
s_preferences.drawtimer.color = CT_DKPURPLE1;
s_preferences.drawtimer.color2 = CT_LTPURPLE1;
s_preferences.drawtimer.textX = MENU_BUTTON_TEXT_X;
s_preferences.drawtimer.textY = MENU_BUTTON_TEXT_Y;
s_preferences.drawtimer.listnames = s_OffOnNone_Names;
s_preferences.drawtimer.width = width;

y += inc;
s_preferences.drawfps.generic.type = MTYPE_SPINCONTROL;
s_preferences.drawfps.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.drawfps.generic.x = x;
s_preferences.drawfps.generic.y = y;
s_preferences.drawfps.generic.callback = Preferences_Event;
s_preferences.drawfps.generic.id = ID_DRAWFPS;
s_preferences.drawfps.textEnum = MBT_DRAW_FPS;
s_preferences.drawfps.textcolor = CT_BLACK;
s_preferences.drawfps.textcolor2 = CT_WHITE;
s_preferences.drawfps.color = CT_DKPURPLE1;
s_preferences.drawfps.color2 = CT_LTPURPLE1;
s_preferences.drawfps.textX = MENU_BUTTON_TEXT_X;
s_preferences.drawfps.textY = MENU_BUTTON_TEXT_Y;
s_preferences.drawfps.listnames = s_OffOnNone_Names;
s_preferences.drawfps.width = width;

y += inc;
s_preferences.allowdownload.generic.type = MTYPE_SPINCONTROL;
s_preferences.allowdownload.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
Expand Down Expand Up @@ -517,6 +565,8 @@ static void GameOptions_MenuInit( void )
Menu_AddItem( &s_gameoptions.menu, &s_preferences.forcemodel );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.drawteamoverlay );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.allowdownload );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.drawtimer );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.drawfps );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.textlanguage );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.voicelanguage );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.crosshair);
Expand Down
2 changes: 1 addition & 1 deletion code/ui/ui_sound.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ void SoundMenu_Init(void)
soundOptionsInfo.sfxvolume.picY = y;
soundOptionsInfo.sfxvolume.picWidth = MENU_BUTTON_MED_WIDTH;
soundOptionsInfo.sfxvolume.picHeight = MENU_BUTTON_MED_HEIGHT;
soundOptionsInfo.sfxvolume.textEnum = soundEngineConfig.global_s_volume ? MBT_SOUND_OVERALL_VOLUME : MBT_EFFECTSVOLUME;
soundOptionsInfo.sfxvolume.textEnum = soundEngineConfig.global_s_volume ? MBT_SOUND_GENERAL_VOLUME : MBT_EFFECTSVOLUME;
soundOptionsInfo.sfxvolume.textX = 5;
soundOptionsInfo.sfxvolume.textY = 1;
soundOptionsInfo.sfxvolume.textcolor = CT_BLACK;
Expand Down

0 comments on commit a9487d0

Please sign in to comment.