UI: Implement changes for better VoiP UI support

See #143
PadWorld-Entertainment · Apr 8, 2022 · dd7bf03 · dd7bf03
1 parent e6ecb4c
commit dd7bf03
Show file tree

Hide file tree

Showing 11 changed files with 351 additions and 195 deletions.
diff --git a/code/client/cl_main.c b/code/client/cl_main.c
@@ -3367,7 +3367,7 @@ void CL_Init(void) {
 	cl_voipSend = Cvar_Get("cl_voipSend", "0", 0);
 	cl_voipSendTarget = Cvar_Get("cl_voipSendTarget", "spatial", 0);
 	cl_voipGainDuringCapture = Cvar_Get("cl_voipGainDuringCapture", "0.2", CVAR_ARCHIVE);
-	cl_voipCaptureMult = Cvar_Get("cl_voipCaptureMult", "4.0", CVAR_ARCHIVE);
+	cl_voipCaptureMult = Cvar_Get("cl_voipCaptureMult", "2.0", CVAR_ARCHIVE);
 	cl_voipUseVAD = Cvar_Get("cl_voipUseVAD", "0", CVAR_ARCHIVE);
 	cl_voipVADThreshold = Cvar_Get("cl_voipVADThreshold", "0.25", CVAR_ARCHIVE);
 	cl_voipShowMeter = Cvar_Get("cl_voipShowMeter", "1", CVAR_ARCHIVE);

diff --git a/code/ui/ui_display.c b/code/ui/ui_display.c
@@ -33,13 +33,13 @@ DISPLAY OPTIONS MENU
 #define BACK0 "menu/buttons/back0"
 #define BACK1 "menu/buttons/back1"
 #define GRAPHICS0 "menu/buttons/graphics0"
-#define GRASHICS1 "menu/buttons/graphics1"
+#define GRAPHICS1 "menu/buttons/graphics1"
 #define DISPLAY0 "menu/buttons/display0"
 #define DISPLAY1 "menu/buttons/display1"
 #define SOUND0 "menu/buttons/sound0"
 #define SOUND1 "menu/buttons/sound1"
-#define NETWORK0 "menu/buttons/network0"
-#define NETWORK1 "menu/buttons/network1"
+#define NETWORK0 "menu/buttons/netvoip0"
+#define NETWORK1 "menu/buttons/netvoip1"
 #define ACCEPT0 "menu/buttons/accept"
 #define ACCEPT1 "menu/buttons/accept"
 
@@ -235,7 +235,7 @@ static void UI_DisplayOptionsMenu_Init(void) {
 	displayOptionsInfo.graphics.generic.y = 37;
 	displayOptionsInfo.graphics.width = 160;
 	displayOptionsInfo.graphics.height = 40;
-	displayOptionsInfo.graphics.focuspic = GRASHICS1;
+	displayOptionsInfo.graphics.focuspic = GRAPHICS1;
 	displayOptionsInfo.graphics.focuspicinstead = qtrue;
 
 	displayOptionsInfo.display.generic.type = MTYPE_BITMAP;
@@ -484,7 +484,7 @@ void UI_DisplayOptionsMenu_Cache(void) {
 	trap_R_RegisterShaderNoMip(BACK0);
 	trap_R_RegisterShaderNoMip(BACK1);
 	trap_R_RegisterShaderNoMip(GRAPHICS0);
-	trap_R_RegisterShaderNoMip(GRASHICS1);
+	trap_R_RegisterShaderNoMip(GRAPHICS1);
 	trap_R_RegisterShaderNoMip(DISPLAY0);
 	trap_R_RegisterShaderNoMip(DISPLAY1);
 	trap_R_RegisterShaderNoMip(SOUND0);

diff --git a/code/ui/ui_local.h b/code/ui/ui_local.h
@@ -307,6 +307,7 @@ extern void Menu_SetCursor(menuframework_s *s, int cursor);
 extern void Menu_SetCursorToItem(menuframework_s *m, void *ptr);
 extern sfxHandle_t Menu_DefaultKey(menuframework_s *s, int key);
 extern sfxHandle_t ScrollList_Key(menulist_s *l, int key);
+extern void SpinControl_Init(menulist_s *s);
 
 extern sfxHandle_t menu_move_sound;
 extern sfxHandle_t menu_switch_sound;