From 53d93b1af059b5f8b4c701ac4a56d0472df591ba Mon Sep 17 00:00:00 2001 From: myT Date: Wed, 27 Dec 2017 07:33:59 +0100 Subject: [PATCH] new default values sv_pure 0 for clients - 1 is annoyingly restrictive for a client s_volume 0.2 - it was so damn loud com_hunkMegs 128 for clients - to cope with "big" maps r_msaa 0 - too many players still gaming with toasters r_gamma 1.2 --- code/client/snd_main.cpp | 2 +- code/qcommon/common.cpp | 6 +++++- code/renderer/tr_init.cpp | 4 ++-- code/server/sv_init.cpp | 10 +++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/code/client/snd_main.cpp b/code/client/snd_main.cpp index b92be23..78c62f9 100644 --- a/code/client/snd_main.cpp +++ b/code/client/snd_main.cpp @@ -235,7 +235,7 @@ static void S_Music_f( void ) static const cvarTableItem_t cl_cvars[] = { - { &s_volume, "s_volume", "0.8", CVAR_ARCHIVE, CVART_FLOAT, "0", "1", "global sound volume" }, + { &s_volume, "s_volume", "0.2", CVAR_ARCHIVE, CVART_FLOAT, "0", "1", "global sound volume" }, { &s_musicVolume, "s_musicvolume", "0", CVAR_ARCHIVE, CVART_FLOAT, "0", "16", "music volume" }, { &s_initsound, "s_initsound", "1", 0, CVART_BOOL, NULL, NULL, "enables the audio system" }, { &s_autoMute, "s_autoMute", "1", CVAR_ARCHIVE, CVART_INTEGER, "0", "2", help_s_autoMute } diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp index 5aedb7f..2801343 100644 --- a/code/qcommon/common.cpp +++ b/code/qcommon/common.cpp @@ -50,8 +50,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define MIN_COMHUNKMEGS_DED 8 // for the dedicated server #define MIN_COMHUNKMEGS 56 -#define DEF_COMHUNKMEGS 64 #define DEF_COMZONEMEGS 32 +#ifdef DEDICATED +#define DEF_COMHUNKMEGS 64 +#else +#define DEF_COMHUNKMEGS 128 +#endif static jmp_buf abortframe; // an ERR_DROP occured, exit the entire frame diff --git a/code/renderer/tr_init.cpp b/code/renderer/tr_init.cpp index c46a91d..68adb3b 100644 --- a/code/renderer/tr_init.cpp +++ b/code/renderer/tr_init.cpp @@ -534,7 +534,7 @@ static const cvarTableItem_t r_cvars[] = // latched and archived variables // { &r_ext_max_anisotropy, "r_ext_max_anisotropy", "16", CVAR_ARCHIVE | CVAR_LATCH, CVART_INTEGER, "0", "16", help_r_ext_max_anisotropy }, - { &r_msaa, "r_msaa", "4", CVAR_ARCHIVE | CVAR_LATCH, CVART_INTEGER, "0", "16", "anti-aliasing sample count, " S_COLOR_VAL "0" S_COLOR_HELP "=off" }, + { &r_msaa, "r_msaa", "0", CVAR_ARCHIVE | CVAR_LATCH, CVART_INTEGER, "0", "16", "anti-aliasing sample count, " S_COLOR_VAL "0" S_COLOR_HELP "=off" }, { &r_picmip, "r_picmip", "0", CVAR_ARCHIVE | CVAR_LATCH, CVART_INTEGER, "0", "16", help_r_picmip }, { &r_roundImagesDown, "r_roundImagesDown", "0", CVAR_ARCHIVE | CVAR_LATCH, CVART_BOOL, NULL, NULL, help_r_roundImagesDown }, { &r_colorMipLevels, "r_colorMipLevels", "0", CVAR_LATCH, CVART_BOOL, NULL, NULL, "colorizes textures based on their mip level" }, @@ -572,7 +572,7 @@ static const cvarTableItem_t r_cvars[] = { &r_finish, "r_finish", "0", CVAR_ARCHIVE, CVART_BOOL, NULL, NULL, "enables glFinish calls" }, { &r_textureMode, "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE, CVART_STRING, NULL, NULL, help_r_textureMode }, { &r_swapInterval, "r_swapInterval", "0", CVAR_ARCHIVE, CVART_INTEGER, "0", "8", help_r_swapInterval }, - { &r_gamma, "r_gamma", "1", CVAR_ARCHIVE, CVART_FLOAT, "0.5", "3", help_r_gamma }, + { &r_gamma, "r_gamma", "1.2", CVAR_ARCHIVE, CVART_FLOAT, "0.5", "3", help_r_gamma }, { &r_greyscale, "r_greyscale", "0", CVAR_ARCHIVE, CVART_FLOAT, "0", "1", "controls how monochrome the final image looks" }, { &r_lightmap, "r_lightmap", "0", CVAR_ARCHIVE, CVART_BOOL, NULL, NULL, help_r_lightmap }, { &r_fullbright, "r_fullbright", "0", CVAR_ARCHIVE, CVART_BOOL, NULL, NULL, help_r_fullbright }, diff --git a/code/server/sv_init.cpp b/code/server/sv_init.cpp index 8098146..9f2bade 100644 --- a/code/server/sv_init.cpp +++ b/code/server/sv_init.cpp @@ -528,6 +528,12 @@ void SV_SpawnServer( const char* mapname ) } +#ifdef DEDICATED +# define SV_PURE_DEFAULT "1" +#else +# define SV_PURE_DEFAULT "0" +#endif + static const cvarTableItem_t sv_cvars[] = { // serverinfo vars @@ -546,7 +552,7 @@ static const cvarTableItem_t sv_cvars[] = // systeminfo vars { NULL, "sv_cheats", "0", CVAR_SYSTEMINFO | CVAR_ROM, CVART_BOOL, NULL, NULL, "enables cheat commands and changing cheat cvars" }, { &sv_serverid, "sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM, CVART_INTEGER, NULL, NULL, "server session identifier" }, - { &sv_pure, "sv_pure", "1", CVAR_SYSTEMINFO | CVAR_ROM, CVART_BOOL, NULL, NULL, "disables native code and forces client pk3s to match the server's" }, + { &sv_pure, "sv_pure", SV_PURE_DEFAULT, CVAR_SYSTEMINFO | CVAR_ROM, CVART_BOOL, NULL, NULL, "disables native code and forces client pk3s to match the server's" }, { NULL, "sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM, CVART_STRING, NULL, NULL, "checksums of the paks you're allowed to load data from" }, { NULL, "sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM, CVART_STRING, NULL, NULL, "names of the paks you're allowed to load data from" }, { NULL, "sv_referencedPaks", "", CVAR_SYSTEMINFO | CVAR_ROM, CVART_STRING, NULL, NULL, "checksums of the paks you might need to download" }, @@ -568,6 +574,8 @@ static const cvarTableItem_t sv_cvars[] = { &sv_minRestartDelay, "sv_minRestartDelay", "2", 0, CVART_INTEGER, "1", "48", "min. hours to wait before restarting the server" } }; +#undef SV_PURE_DEFAULT + /* ===============