nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-12 23:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

CLIENT: Save settings applied in menu

Browse source
This commit is contained in:
MotoLegacy 2023-11-05 17:41:20 -05:00
parent 8bdf2e2f1f
commit 64c63ab614
3 changed files with 53 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/client/main.qc
View file

@ -157,18 +157,19 @@ noref void(float apiver, string enginename, float enginever) CSQC_Init =
screen_height_219[1] = 1440; screen_height_219[1] = 1440;
// cvars for custom settings // cvars for custom settings
cvar_set("cl_adsmode", "0"); autocvar(cl_adsmode, 0);
cvar_set("cl_cinematic", "0"); autocvar(cl_cinematic, 0);
cvar_set("nzp_particles", "1"); autocvar(nzp_particles, 1);
cvar_set("nzp_decals", "1"); autocvar(nzp_decals, 1);
autocvar(vid_ultrawide_limiter, 0);
// per-channel volume // per-channel volume
cvar_set("snd_channel1volume", "1"); autocvar(snd_channel1volume, 1);
cvar_set("snd_channel2volume", "1"); autocvar(snd_channel2volume, 1);
cvar_set("snd_channel3volume", "1"); autocvar(snd_channel3volume, 1);
cvar_set("snd_channel4volume", "1"); autocvar(snd_channel4volume, 1);
cvar_set("snd_channel5volume", "1"); autocvar(snd_channel5volume, 1);
cvar_set("snd_channel6volume", "1"); autocvar(snd_channel6volume, 1);
// force nearest filtering for hud elements to avoid blur // force nearest filtering for hud elements to avoid blur
cvar_set("gl_texturemode2d", "gl_nearest"); cvar_set("gl_texturemode2d", "gl_nearest");
@ -178,7 +179,7 @@ noref void(float apiver, string enginename, float enginever) CSQC_Init =
cvar_set("cl_showbuildtime", "1"); cvar_set("cl_showbuildtime", "1");
// in-game stopwatch // in-game stopwatch
registercvar("scr_serverstopwatch", "0"); autocvar(scr_serverstopwatch, 0);
stopwatch_sec = stopwatch_min = stopwatch_hr = 0; stopwatch_sec = stopwatch_min = stopwatch_hr = 0;
// retrieve custom maps // retrieve custom maps

74
source/client/menu.qc
View file

@ -82,6 +82,9 @@ void() menu_quit =
void() menu_back = void() menu_back =
{ {
if (in_menu == MENU_CSETTINGS)
localcmd("saveconfig\n");
if (in_menu == MENU_GSETTINGS || in_menu == MENU_CSETTINGS || if (in_menu == MENU_GSETTINGS || in_menu == MENU_CSETTINGS ||
in_menu == MENU_AUDSETTINGS || in_menu == MENU_CONSETTINGS) { in_menu == MENU_AUDSETTINGS || in_menu == MENU_CONSETTINGS) {
if (wasigs == TRUE) if (wasigs == TRUE)
@ -225,7 +228,7 @@ void() settings_fps = {
else else
fps = 0; fps = 0;
cvar_set("show_fps", ftos(fps)); localcmd(strcat("seta show_fps ", ftos(fps)));
} }
void() settings_rescale = { void() settings_rescale = {
@ -236,7 +239,7 @@ void() settings_rescale = {
if (renderscale > 1) if (renderscale > 1)
renderscale = 1; renderscale = 1;
cvar_set("r_renderscale", ftos(renderscale)); localcmd(strcat("seta r_renderscale ", ftos(renderscale)));
} }
void() settings_rescale2 = { void() settings_rescale2 = {
@ -247,7 +250,7 @@ void() settings_rescale2 = {
if (renderscale < 0.10) if (renderscale < 0.10)
renderscale = 0.10; renderscale = 0.10;
cvar_set("r_renderscale", ftos(renderscale)); localcmd(strcat("seta r_renderscale ", ftos(renderscale)));
} }
void() settings_brite = { void() settings_brite = {
@ -259,7 +262,7 @@ void() settings_brite = {
br = 2; br = 2;
} }
cvar_set("gamma", ftos(br)); localcmd(strcat("seta gamma ", ftos(br)));
} }
void() settings_brite2 = { void() settings_brite2 = {
@ -271,7 +274,7 @@ void() settings_brite2 = {
br = 0.5; br = 0.5;
} }
cvar_set("gamma", ftos(br)); localcmd(strcat("seta gamma ", ftos(br)));
} }
void() settings_fov = { void() settings_fov = {
@ -281,7 +284,7 @@ void() settings_fov = {
if (fov < 120) if (fov < 120)
fov += 5; fov += 5;
cvar_set("fov", ftos(fov)); localcmd(strcat("seta fov ", ftos(fov)));
} }
void() settings_fov2 = { void() settings_fov2 = {
@ -291,7 +294,7 @@ void() settings_fov2 = {
if (fov > 50) if (fov > 50)
fov -= 5; fov -= 5;
cvar_set("fov", ftos(fov)); localcmd(strcat("seta fov ", ftos(fov)));
} }
void() settings_mfps = { void() settings_mfps = {
@ -304,7 +307,7 @@ void() settings_mfps = {
if (fps < 500) if (fps < 500)
fps += 5; fps += 5;
cvar_set("cl_maxfps", ftos(fps)); localcmd(strcat("seta cl_maxfps ", ftos(fps)));
} }
void() settings_mfps2 = { void() settings_mfps2 = {
@ -317,7 +320,7 @@ void() settings_mfps2 = {
if (fps > 20) if (fps > 20)
fps -= 5; fps -= 5;
cvar_set("cl_maxfps", ftos(fps)); localcmd(strcat("seta cl_maxfps ", ftos(fps)));
} }
void() settings_vs = { void() settings_vs = {
@ -328,7 +331,7 @@ void() settings_vs = {
else else
vs = 0; vs = 0;
cvar_set("vid_vsync", ftos(vs)); localcmd(strcat("seta vid_vsync ", ftos(vs)));
} }
void() settings_fs = { void() settings_fs = {
@ -340,9 +343,9 @@ void() settings_fs = {
void() settings_xb = { void() settings_xb = {
if (cvar("vid_ultrawide_limiter")) { if (cvar("vid_ultrawide_limiter")) {
cvar_set("vid_ultrawide_limiter", "0"); localcmd("seta vid_ultrawide_limiter 0");
} else { } else {
cvar_set("vid_ultrawide_limiter", "1"); localcmd("seta vid_ultrawide_limiter 1");
} }
} }
@ -354,7 +357,7 @@ void() settings_pt = {
else else
pt = 0; pt = 0;
cvar_set("nzp_particles", ftos(pt)); localcmd(strcat("seta nzp_particles ", ftos(pt)));
} }
void() settings_fb = { void() settings_fb = {
@ -365,14 +368,14 @@ void() settings_fb = {
else else
fb = 0; fb = 0;
cvar_set("r_fullbright", ftos(fb)); localcmd(strcat("seta r_fullbright ", ftos(fb)));
} }
void() settings_ro = { void() settings_ro = {
if (cvar_string("gl_texturemode") == "gl_nearest") if (cvar_string("gl_texturemode") == "gl_nearest")
cvar_set("gl_texturemode", "gl_linear_mipmap_linear"); localcmd("seta gl_texturemode gl_linear_mipmap_linear");
else else
cvar_set("gl_texturemode", "gl_nearest"); localcmd("seta gl_texturemode gl_nearest");
} }
void() UpdateResolutions = { void() UpdateResolutions = {
@ -546,7 +549,7 @@ void() settings_apply = {
localcmd(strcat("vid_fullscreen ", ftos(fullscreenval), "\n")); localcmd(strcat("vid_fullscreen ", ftos(fullscreenval), "\n"));
localcmd("vid_restart\n"); localcmd("vid_restart\n");
} }
localcmd("saveconfig\n");
} }
void() bind_walkf = { void() bind_walkf = {
@ -700,7 +703,7 @@ void() settings_sens = {
if (sens > 15) if (sens > 15)
sens = 15; sens = 15;
cvar_set("sensitivity", ftos(sens)); localcmd(strcat("seta sensitivity ", ftos(sens)));
} }
void() settings_sens2 = { void() settings_sens2 = {
@ -711,17 +714,14 @@ void() settings_sens2 = {
if (sens < 0) if (sens < 0)
sens = 0; sens = 0;
cvar_set("sensitivity", ftos(sens)); localcmd(strcat("seta sensitivity ", ftos(sens)));
} }
void() settings_adsmode = void() settings_adsmode =
{ {
float adsmode = cvar("cl_adsmode"); float adsmode = cvar("cl_adsmode");
if (adsmode == 0) localcmd(strcat("seta cl_adsmode ", ftos(!adsmode)));
cvar_set("cl_adsmode", ftos(1));
else
cvar_set("cl_adsmode", ftos(0));
} }
void() setting_mastervol = void() setting_mastervol =
@ -733,7 +733,7 @@ void() setting_mastervol =
if (vol > 1) if (vol > 1)
vol = 1; vol = 1;
cvar_set("volume", ftos(vol)); localcmd(strcat("seta volume ", ftos(vol)));
} }
void() setting_mastervol2 = void() setting_mastervol2 =
@ -745,7 +745,7 @@ void() setting_mastervol2 =
if (vol < 0) if (vol < 0)
vol = 0; vol = 0;
cvar_set("volume", ftos(vol)); localcmd(strcat("seta volume ", ftos(vol)));
} }
void() setting_chann1vol = void() setting_chann1vol =
@ -757,7 +757,7 @@ void() setting_chann1vol =
if (vol > 1) if (vol > 1)
vol = 1; vol = 1;
cvar_set("snd_channel1volume", ftos(vol)); localcmd(strcat("seta snd_channel1volume ", ftos(vol)));
} }
void() setting_chann1vol2 = void() setting_chann1vol2 =
@ -769,7 +769,7 @@ void() setting_chann1vol2 =
if (vol < 0) if (vol < 0)
vol = 0; vol = 0;
cvar_set("snd_channel1volume", ftos(vol)); localcmd(strcat("seta snd_channel1volume ", ftos(vol)));
} }
void() setting_chann2vol = void() setting_chann2vol =
@ -781,7 +781,7 @@ void() setting_chann2vol =
if (vol > 1) if (vol > 1)
vol = 1; vol = 1;
cvar_set("snd_channel2volume", ftos(vol)); localcmd(strcat("seta snd_channel2volume ", ftos(vol)));
} }
void() setting_chann2vol2 = void() setting_chann2vol2 =
@ -793,7 +793,7 @@ void() setting_chann2vol2 =
if (vol < 0) if (vol < 0)
vol = 0; vol = 0;
cvar_set("snd_channel2volume", ftos(vol)); localcmd(strcat("seta snd_channel2volume ", ftos(vol)));
} }
void() setting_chann3vol = void() setting_chann3vol =
@ -805,7 +805,7 @@ void() setting_chann3vol =
if (vol > 1) if (vol > 1)
vol = 1; vol = 1;
cvar_set("snd_channel3volume", ftos(vol)); localcmd(strcat("seta snd_channel3volume ", ftos(vol)));
} }
void() setting_chann3vol2 = void() setting_chann3vol2 =
@ -817,7 +817,7 @@ void() setting_chann3vol2 =
if (vol < 0) if (vol < 0)
vol = 0; vol = 0;
cvar_set("snd_channel3volume", ftos(vol)); localcmd(strcat("seta snd_channel3volume ", ftos(vol)));
} }
void() setting_chann4vol = void() setting_chann4vol =
@ -829,7 +829,7 @@ void() setting_chann4vol =
if (vol > 1) if (vol > 1)
vol = 1; vol = 1;
cvar_set("snd_channel4volume", ftos(vol)); localcmd(strcat("seta snd_channel4volume ", ftos(vol)));
} }
void() setting_chann4vol2 = void() setting_chann4vol2 =
@ -841,7 +841,7 @@ void() setting_chann4vol2 =
if (vol < 0) if (vol < 0)
vol = 0; vol = 0;
cvar_set("snd_channel4volume", ftos(vol)); localcmd(strcat("seta snd_channel4volume ", ftos(vol)));
} }
void() setting_chann5vol = void() setting_chann5vol =
@ -853,7 +853,7 @@ void() setting_chann5vol =
if (vol > 1) if (vol > 1)
vol = 1; vol = 1;
cvar_set("snd_channel5volume", ftos(vol)); localcmd(strcat("seta snd_channel5volume ", ftos(vol)));
} }
void() setting_chann5vol2 = void() setting_chann5vol2 =
@ -865,7 +865,7 @@ void() setting_chann5vol2 =
if (vol < 0) if (vol < 0)
vol = 0; vol = 0;
cvar_set("snd_channel5volume", ftos(vol)); localcmd(strcat("seta snd_channel5volume ", ftos(vol)));
} }
void() setting_chann6vol = void() setting_chann6vol =
@ -877,7 +877,7 @@ void() setting_chann6vol =
if (vol > 1) if (vol > 1)
vol = 1; vol = 1;
cvar_set("snd_channel6volume", ftos(vol)); localcmd(strcat("seta snd_channel6volume ", ftos(vol)));
} }
void() setting_chann6vol2 = void() setting_chann6vol2 =
@ -889,7 +889,7 @@ void() setting_chann6vol2 =
if (vol < 0) if (vol < 0)
vol = 0; vol = 0;
cvar_set("snd_channel6volume", ftos(vol)); localcmd(strcat("seta snd_channel6volume ", ftos(vol)));
} }
//rmb null //rmb null

6
source/server/weapons/weapon_core.qc
View file

@ -94,8 +94,10 @@ void() ReturnWeaponModel =
UpdateV2model(self.weapon2model, GetWepSkin(self.weapon)); UpdateV2model(self.weapon2model, GetWepSkin(self.weapon));
// Always try to reload after any action. // Always try to reload after any action.
if ((self.weapons[0].weapon_magazine == 0 || self.weapons[0].weapon_magazine_left == 0) && self.weapons[0].weapon_reserve != 0) if (self.weapons[0].weapon_magazine == 0 && self.weapons[0].weapon_reserve != 0)
W_Reload(S_BOTH); W_Reload(S_RIGHT);
if (IsDualWeapon(self.weapon) && self.weapons[0].weapon_magazine_left == 0 && self.weapons[0].weapon_reserve != 0)
W_Reload(S_LEFT);
// If the person is swapping, play the sprint anim if they're sprinting after swap. Otherwise it plays idle // If the person is swapping, play the sprint anim if they're sprinting after swap. Otherwise it plays idle
if (self.sprinting == TRUE) if (self.sprinting == TRUE)