nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-21 19:32:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

CLIENT: Add cl_controllerglyphs cvar, control Glyph Brand in settings

Browse source
This commit is contained in:
cypress 2024-06-29 19:25:28 -07:00
parent 9ec5bf9de4
commit 6a40f9aef3
2 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/client/main.qc
View file

@ -80,6 +80,7 @@ noref void(float apiver, string enginename, float enginever) CSQC_Init =
cvar_set("sv_cheats", ftos(1)); cvar_set("sv_cheats", ftos(1));
cvar_set("r_fb_models", ftos(0)); cvar_set("r_fb_models", ftos(0));
autocvar(r_viewmodel_default_fov, 70); autocvar(r_viewmodel_default_fov, 70);
autocvar(cl_controllerglyphs, "xbox");
// Runtime check if we're running this in WebASM/WebGL. // Runtime check if we're running this in WebASM/WebGL.
if (cvar_string("sys_platform") == "Web") if (cvar_string("sys_platform") == "Web")

49
source/client/menu.qc
View file

@ -843,6 +843,29 @@ void() setting_connect =
localcmd(strcat("connect ", temp_server_name)); localcmd(strcat("connect ", temp_server_name));
} }
void() setting_glyph =
{
string current_glyph_brand = cvar_string("cl_controllerglyphs");
string new_glyph_brand = "";
switch(current_glyph_brand) {
case "xbox":
new_glyph_brand = "sony";
break;
case "sony":
new_glyph_brand = "nintendo";
break;
case "nintendo":
new_glyph_brand = "generic";
break;
default:
new_glyph_brand = "xbox";
break;
}
cvar_set("cl_controllerglyphs", new_glyph_brand);
}
//rmb null //rmb null
void() null = { void() null = {
return; return;
@ -978,6 +1001,7 @@ var struct
// Control Settings (cont.) // Control Settings (cont.)
{[6, 115], "Invert Mouse", -1, setting_invert, null, MENU_CONSETTINGS, 0, OPTION_WEB_AND_EXE}, // 66 {[6, 115], "Invert Mouse", -1, setting_invert, null, MENU_CONSETTINGS, 0, OPTION_WEB_AND_EXE}, // 66
{[6, 135], "Controller Glyphs", -1, setting_glyph, null, MENU_CONSETTINGS, 0, OPTION_WEB_AND_EXE}, // 67
// Main menu (cont.) // Main menu (cont.)
{[6, 145], "Achievements (Not on Web)", -1, null, null, MENU_MAIN, 1, OPTION_WEB_ONLY}, // 3 {[6, 145], "Achievements (Not on Web)", -1, null, null, MENU_MAIN, 1, OPTION_WEB_ONLY}, // 3
@ -1477,6 +1501,28 @@ void() Draw_Extra_CSettings =
else else
drawstring([320, 115], S_ENABLED, [14, 14], [1, 1, 1], 1, 0); drawstring([320, 115], S_ENABLED, [14, 14], [1, 1, 1], 1, 0);
// Controller Glyphs
string controller_glyph_brand = "Unknown";
switch(cvar_string("cl_controllerglyphs")) {
case "xbox":
controller_glyph_brand = "Microsoft";
break;
case "sony":
controller_glyph_brand = "Sony";
break;
case "nintendo":
controller_glyph_brand = "Nintendo";
break;
case "generic":
controller_glyph_brand = "Libre";
break;
default:
controller_glyph_brand = sprintf("User (\"%s\")", cvar_string("cl_controllerglyphs"));
break;
}
drawstring([320, 135], controller_glyph_brand, [14, 14], [1, 1, 1], 1, 0);
drawsubpic([325 + strlen(controller_glyph_brand)*14, 132], [80, 20], sprintf("gfx/controller_glyphs/%s.tga", cvar_string("cl_controllerglyphs")), [0, 0], [0.5, 0.125], [1, 1, 1], 1);
// Descriptions // Descriptions
switch(lastActive) { switch(lastActive) {
case 54: case 54:
@ -1488,6 +1534,9 @@ void() Draw_Extra_CSettings =
case 66: case 66:
cset_desc = "Invert Mouse Input on the Y Axis."; cset_desc = "Invert Mouse Input on the Y Axis.";
break; break;
case 67:
cset_desc = "Glyph Branding type to display for Controllers.";
break;
default: default:
cset_desc = ""; cset_desc = "";
break; break;