From 4eda77649f5d653e3e66885aeecd2cd84acd9fd4 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 11 Mar 2022 19:56:13 +0000 Subject: [PATCH] cvar changes suggested by Bummser --- android/app/src/main/assets/autoexec.cfg | 2 +- android/app/src/main/cpp/code/cgame/cg_main.c | 2 +- android/app/src/main/cpp/code/client/cl_main.c | 4 ++-- android/app/src/main/cpp/code/server/sv_init.c | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/assets/autoexec.cfg b/android/app/src/main/assets/autoexec.cfg index 48f28377..202e66b3 100644 --- a/android/app/src/main/assets/autoexec.cfg +++ b/android/app/src/main/assets/autoexec.cfg @@ -25,7 +25,7 @@ set vr_button_map_Y "+button3" set vr_button_map_Y_ALT "" set vr_button_map_SECONDARYTHUMBSTICK "+scores" set vr_button_map_SECONDARYTHUMBSTICK_ALT "" -set vr_button_map_PRIMARYTHUMBSTICK "" +set vr_button_map_PRIMARYTHUMBSTICK "+weapon_select" set vr_button_map_PRIMARYTHUMBSTICK_ALT "" set vr_button_map_RTHUMBFORWARD "+weapon_select" set vr_button_map_RTHUMBFORWARD_ALT "weapon 2" diff --git a/android/app/src/main/cpp/code/cgame/cg_main.c b/android/app/src/main/cpp/code/cgame/cg_main.c index 3d39a570..4e455bb3 100644 --- a/android/app/src/main/cpp/code/cgame/cg_main.c +++ b/android/app/src/main/cpp/code/cgame/cg_main.c @@ -324,7 +324,7 @@ static cvarTable_t cvarTable[] = { { &cg_timescaleFadeEnd, "cg_timescaleFadeEnd", "1", 0}, { &cg_timescaleFadeSpeed, "cg_timescaleFadeSpeed", "0", 0}, { &cg_timescale, "timescale", "1", 0}, - { &cg_scorePlum, "cg_scorePlums", "1", CVAR_USERINFO | CVAR_ARCHIVE}, + { &cg_scorePlum, "cg_scorePlums", "0", CVAR_USERINFO | CVAR_ARCHIVE}, { &cg_smoothClients, "cg_smoothClients", "1", CVAR_USERINFO | CVAR_ARCHIVE}, { &cg_cameraMode, "com_cameraMode", "0", CVAR_CHEAT}, diff --git a/android/app/src/main/cpp/code/client/cl_main.c b/android/app/src/main/cpp/code/client/cl_main.c index d7ed0770..b33e1002 100644 --- a/android/app/src/main/cpp/code/client/cl_main.c +++ b/android/app/src/main/cpp/code/client/cl_main.c @@ -3622,9 +3622,9 @@ void CL_Init( void ) { cl_consoleKeys = Cvar_Get( "cl_consoleKeys", "~ ` 0x7e 0x60", CVAR_ARCHIVE); // userinfo - Cvar_Get ("name", "VR_Player", CVAR_USERINFO | CVAR_ARCHIVE ); + Cvar_Get ("name", "[VR] Player", CVAR_USERINFO | CVAR_ARCHIVE ); cl_rate = Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE ); - Cvar_Get ("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE ); + Cvar_Get ("snaps", "40", CVAR_USERINFO | CVAR_ARCHIVE ); Cvar_Get ("model", "sarge", CVAR_USERINFO | CVAR_ARCHIVE ); Cvar_Get ("headmodel", "sarge", CVAR_USERINFO | CVAR_ARCHIVE ); Cvar_Get ("team_model", "james", CVAR_USERINFO | CVAR_ARCHIVE ); diff --git a/android/app/src/main/cpp/code/server/sv_init.c b/android/app/src/main/cpp/code/server/sv_init.c index f1aee2fe..ee017d4e 100644 --- a/android/app/src/main/cpp/code/server/sv_init.c +++ b/android/app/src/main/cpp/code/server/sv_init.c @@ -637,12 +637,12 @@ void SV_Init (void) Cvar_Get ("sv_keywords", "", CVAR_SERVERINFO); sv_mapname = Cvar_Get ("mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM); sv_privateClients = Cvar_Get ("sv_privateClients", "0", CVAR_SERVERINFO); - sv_hostname = Cvar_Get ("sv_hostname", "noname", CVAR_SERVERINFO | CVAR_ARCHIVE ); + sv_hostname = Cvar_Get ("sv_hostname", "Quake3Quest", CVAR_SERVERINFO | CVAR_ARCHIVE ); sv_maxclients = Cvar_Get ("sv_maxclients", "8", CVAR_SERVERINFO | CVAR_LATCH); sv_minRate = Cvar_Get ("sv_minRate", "0", CVAR_ARCHIVE | CVAR_SERVERINFO ); sv_maxRate = Cvar_Get ("sv_maxRate", "0", CVAR_ARCHIVE | CVAR_SERVERINFO ); - sv_dlRate = Cvar_Get("sv_dlRate", "100", CVAR_ARCHIVE | CVAR_SERVERINFO); + sv_dlRate = Cvar_Get("sv_dlRate", "1000", CVAR_ARCHIVE | CVAR_SERVERINFO); sv_minPing = Cvar_Get ("sv_minPing", "0", CVAR_ARCHIVE | CVAR_SERVERINFO ); sv_maxPing = Cvar_Get ("sv_maxPing", "0", CVAR_ARCHIVE | CVAR_SERVERINFO ); sv_floodProtect = Cvar_Get ("sv_floodProtect", "1", CVAR_ARCHIVE | CVAR_SERVERINFO ); @@ -650,7 +650,7 @@ void SV_Init (void) // systeminfo Cvar_Get ("sv_cheats", "1", CVAR_SYSTEMINFO | CVAR_ROM ); sv_serverid = Cvar_Get ("sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM ); - sv_pure = Cvar_Get ("sv_pure", "1", CVAR_SYSTEMINFO ); + sv_pure = Cvar_Get ("sv_pure", "0", CVAR_SYSTEMINFO ); #ifdef USE_VOIP sv_voip = Cvar_Get("sv_voip", "1", CVAR_LATCH); Cvar_CheckRange(sv_voip, 0, 1, qtrue); @@ -664,7 +664,7 @@ void SV_Init (void) // server vars sv_rconPassword = Cvar_Get ("rconPassword", "", CVAR_TEMP ); sv_privatePassword = Cvar_Get ("sv_privatePassword", "", CVAR_TEMP ); - sv_fps = Cvar_Get ("sv_fps", "20", CVAR_TEMP ); + sv_fps = Cvar_Get ("sv_fps", "40", CVAR_TEMP ); sv_timeout = Cvar_Get ("sv_timeout", "200", CVAR_TEMP ); sv_zombietime = Cvar_Get ("sv_zombietime", "2", CVAR_TEMP ); Cvar_Get ("nextmap", "", CVAR_TEMP ); @@ -685,7 +685,7 @@ void SV_Init (void) sv_mapChecksum = Cvar_Get ("sv_mapChecksum", "", CVAR_ROM); sv_lanForceRate = Cvar_Get ("sv_lanForceRate", "1", CVAR_ARCHIVE ); #ifndef STANDALONE - sv_strictAuth = Cvar_Get ("sv_strictAuth", "1", CVAR_ARCHIVE ); + sv_strictAuth = Cvar_Get ("sv_strictAuth", "0", CVAR_ARCHIVE ); #endif sv_banFile = Cvar_Get("sv_banFile", "serverbans.dat", CVAR_ARCHIVE);