Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

renamed cvar to convar (this makes more sense to me), added descripti…

…on for all console commands, enabled Swap_init() in idLib, fixed compiling dedicated server for Win64 solution
  • Loading branch information...
commit 1b5c40e1f4efc2049175a3a1762cc4f1293e6587 1 parent 1d0cbe2
@TheDushan authored
Showing with 2,302 additions and 2,186 deletions.
  1. +4 −2 src/engine/OpenWolf.vcxproj
  2. +3 −3 src/engine/OpenWolf.vcxproj.filters
  3. +35 −35 src/engine/client/cl_console.cpp
  4. +12 −12 src/engine/client/cl_input.cpp
  5. +16 −16 src/engine/client/cl_irc.cpp
  6. +215 −218 src/engine/client/cl_main.cpp
  7. +11 −11 src/engine/client/cl_scrn.cpp
  8. +5 −5 src/engine/client/cl_ui.cpp
  9. +97 −97 src/engine/client/client.h
  10. +1 −1  src/engine/client/ui_api.h
  11. +1 −1  src/engine/cm/CollisionModel_files.cpp
  12. +2 −2 src/engine/cm/CollisionModel_load.cpp
  13. +6 −4 src/engine/cm/CollisionModel_q3BSP.cpp
  14. +15 −15 src/engine/database/database.h
  15. +28 −28 src/engine/database/db_main.cpp
  16. +1 −1  src/engine/database/db_mysql.cpp
  17. +2 −0  src/engine/framework/KeyInput.h
  18. +1 −1  src/engine/idLib/Lib.cpp
  19. +2 −2 src/engine/idLib/precompiled.h
  20. +4 −4 src/engine/null/null_client.cpp
  21. +17 −0 src/engine/null/null_input.cpp
  22. +14 −14 src/engine/qcommon/cm_load.cpp
  23. +7 −7 src/engine/qcommon/cm_local.h
  24. +7 −7 src/engine/qcommon/cm_trace.cpp
  25. +21 −3 src/engine/qcommon/cmd.cpp
  26. +102 −104 src/engine/qcommon/common.cpp
  27. +129 −77 src/engine/qcommon/cvar.cpp
  28. +22 −22 src/engine/qcommon/files.cpp
  29. +2 −2 src/engine/qcommon/msg.cpp
  30. +6 −6 src/engine/qcommon/net_chan.cpp
  31. +9 −9 src/engine/qcommon/net_http.cpp
  32. +26 −26 src/engine/qcommon/net_ip.cpp
  33. +6 −5 src/engine/qcommon/q_shared.h
  34. +32 −32 src/engine/qcommon/qcommon.h
  35. +3 −3 src/engine/qcommon/vm.cpp
  36. +131 −131 src/engine/renderer/tr_init.c
  37. +3 −3 src/engine/renderer/tr_light.c
  38. +122 −122 src/engine/renderer/tr_local.h
  39. +1 −1  src/engine/renderer/tr_model.c
  40. +2 −2 src/engine/renderer/tr_public.h
  41. +1 −1  src/engine/rendererGL/tr_image_png.cpp
  42. +534 −534 src/engine/rendererGL/tr_init.cpp
  43. +277 −277 src/engine/rendererGL/tr_local.h
  44. +2 −2 src/engine/rendererGL/tr_public.h
  45. +50 −50 src/engine/server/server.h
  46. +25 −25 src/engine/server/sv_bot.cpp
  47. +1 −1  src/engine/server/sv_ccmds.cpp
  48. +85 −85 src/engine/server/sv_init.cpp
  49. +54 −54 src/engine/server/sv_main.cpp
  50. +4 −4 src/engine/snd_system/snd_dma.cpp
  51. +5 −5 src/engine/snd_system/snd_local.h
  52. +17 −17 src/engine/snd_system/snd_main.cpp
  53. +2 −2 src/engine/snd_system/snd_mem.cpp
  54. +30 −30 src/engine/snd_system/snd_openal.cpp
  55. +12 −12 src/engine/sys/sdl_glimp.cpp
  56. +24 −24 src/engine/sys/sdl_input.cpp
  57. +10 −10 src/engine/sys/sdl_snd.cpp
  58. +3 −3 src/engine/sys/sdl_vid.cpp
  59. +5 −1 src/engine/sys/sys_main.cpp
  60. +34 −11 src/engine/sys/sys_win32.cpp
  61. +2 −2 src/engine/sys/sys_win32_con.cpp
  62. +2 −2 src/gamelogic/base/src/ui/ui_api.cpp
View
6 src/engine/OpenWolf.vcxproj
@@ -710,7 +710,7 @@ echo hostname > status-info/build-machine
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>WIN32;AMD64;WIN64;__WIN64__;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;USE_CODEC_VORBIS;USE_LOCAL_HEADERS;USE_CIN_THEORA;HAVE_CONFIG_H;USE_VOIP;USE_MUMBLE;USE_CRYPTO;USE_PHP;HAVE_BZIP2;USE_INCREASED_ENTITIES;ET_SQL;USE_PHYSICS;GUIDMASTER_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;AMD64;WIN64;__WIN64__;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;HAVE_BZIP2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>
</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -1199,7 +1199,9 @@ echo hostname &gt; status-info/build-machine
<ClCompile Include="database\db_main.cpp" />
<ClCompile Include="database\db_mysql.cpp" />
<ClCompile Include="framework\ioapi.cpp" />
- <ClCompile Include="FrameWork\KeyInput.cpp" />
+ <ClCompile Include="FrameWork\KeyInput.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Dedicated|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="framework\Unzip.cpp" />
<ClCompile Include="qcommon\cm_api.cpp" />
<ClCompile Include="qcommon\cm_load.cpp" />
View
6 src/engine/OpenWolf.vcxproj.filters
@@ -84,9 +84,6 @@
<Filter Include="Source Files\SYS">
<UniqueIdentifier>{cc4f70cc-68e6-4783-a17a-9ecc02d9e5b0}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\Console">
- <UniqueIdentifier>{d515d4c0-53ca-46fc-855f-391e2ec82544}</UniqueIdentifier>
- </Filter>
<Filter Include="Source Files\Network">
<UniqueIdentifier>{c3281191-1779-4ef5-9f01-17a2728c476e}</UniqueIdentifier>
</Filter>
@@ -117,6 +114,9 @@
<Filter Include="Source Files\FrameWork">
<UniqueIdentifier>{30518ec2-5b89-4b1e-888f-0bfecde49fe4}</UniqueIdentifier>
</Filter>
+ <Filter Include="Source Files\Console">
+ <UniqueIdentifier>{d515d4c0-53ca-46fc-855f-391e2ec82544}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libs\libnewton\include\dMath\dVector.cpp">
View
70 src/engine/client/cl_console.cpp
@@ -72,30 +72,30 @@ typedef struct {
console_t con;
-cvar_t *con_debug;
-cvar_t *con_conspeed;
-cvar_t *con_notifytime;
-cvar_t *con_autoclear;
+convar_t *con_debug;
+convar_t *con_conspeed;
+convar_t *con_notifytime;
+convar_t *con_autoclear;
// Color and alpha for console
-cvar_t *scr_conUseShader;
+convar_t *scr_conUseShader;
-cvar_t *scr_conColorAlpha;
-cvar_t *scr_conColorRed;
-cvar_t *scr_conColorBlue;
-cvar_t *scr_conColorGreen;
+convar_t *scr_conColorAlpha;
+convar_t *scr_conColorRed;
+convar_t *scr_conColorBlue;
+convar_t *scr_conColorGreen;
// Color and alpha for bar under console
-cvar_t *scr_conBarHeight;
+convar_t *scr_conBarHeight;
-cvar_t *scr_conBarColorAlpha;
-cvar_t *scr_conBarColorRed;
-cvar_t *scr_conBarColorBlue;
-cvar_t *scr_conBarColorGreen;
+convar_t *scr_conBarColorAlpha;
+convar_t *scr_conBarColorRed;
+convar_t *scr_conBarColorBlue;
+convar_t *scr_conBarColorGreen;
-cvar_t *scr_conUseOld;
-cvar_t *scr_conBarSize;
-cvar_t *scr_conHeight;
+convar_t *scr_conUseOld;
+convar_t *scr_conBarSize;
+convar_t *scr_conHeight;
vec4_t console_highlightcolor = { 0.5, 0.5, 0.2, 0.45 };
@@ -513,31 +513,31 @@ void Con_Init(void)
{
Com_Printf("\n----- Console Initialization -------\n");
- con_notifytime = Cvar_Get("con_notifytime", "7", 0); // JPW NERVE increased per id req for obits
- con_conspeed = Cvar_Get("scr_conspeed", "3", 0);
- con_debug = Cvar_Get("con_debug", "0", CVAR_ARCHIVE); //----(SA) added
- con_autoclear = Cvar_Get("con_autoclear", "1", CVAR_ARCHIVE);
+ con_notifytime = Cvar_Get("con_notifytime", "7", 0, "test"); // JPW NERVE increased per id req for obits
+ con_conspeed = Cvar_Get("scr_conspeed", "3", 0, "test");
+ con_debug = Cvar_Get("con_debug", "0", CVAR_ARCHIVE, "test"); //----(SA) added
+ con_autoclear = Cvar_Get("con_autoclear", "1", CVAR_ARCHIVE, "test");
// Defines cvar for color and alpha for console/bar under console
- scr_conUseShader = Cvar_Get ("scr_conUseShader", "0", CVAR_ARCHIVE);
+ scr_conUseShader = Cvar_Get ("scr_conUseShader", "0", CVAR_ARCHIVE, "test");
- scr_conColorAlpha = Cvar_Get ("scr_conColorAlpha", "0.5", CVAR_ARCHIVE);
- scr_conColorRed = Cvar_Get ("scr_conColorRed", "0", CVAR_ARCHIVE);
- scr_conColorBlue = Cvar_Get ("scr_conColorBlue", "0.3", CVAR_ARCHIVE);
- scr_conColorGreen = Cvar_Get ("scr_conColorGreen", "0.23", CVAR_ARCHIVE);
+ scr_conColorAlpha = Cvar_Get ("scr_conColorAlpha", "0.5", CVAR_ARCHIVE, "test");
+ scr_conColorRed = Cvar_Get ("scr_conColorRed", "0", CVAR_ARCHIVE, "test");
+ scr_conColorBlue = Cvar_Get ("scr_conColorBlue", "0.3", CVAR_ARCHIVE, "test");
+ scr_conColorGreen = Cvar_Get ("scr_conColorGreen", "0.23", CVAR_ARCHIVE, "test");
- scr_conUseOld = Cvar_Get ("scr_conUseOld", "0", CVAR_ARCHIVE);
+ scr_conUseOld = Cvar_Get ("scr_conUseOld", "0", CVAR_ARCHIVE, "test");
- scr_conBarHeight = Cvar_Get ("scr_conBarHeight", "2", CVAR_ARCHIVE);
+ scr_conBarHeight = Cvar_Get ("scr_conBarHeight", "2", CVAR_ARCHIVE, "test");
- scr_conBarColorAlpha = Cvar_Get ("scr_conBarColorAlpha", "0.3", CVAR_ARCHIVE);
- scr_conBarColorRed = Cvar_Get ("scr_conBarColorRed", "1", CVAR_ARCHIVE);
- scr_conBarColorBlue = Cvar_Get ("scr_conBarColorBlue", "1", CVAR_ARCHIVE);
- scr_conBarColorGreen = Cvar_Get ("scr_conBarColorGreen", "1", CVAR_ARCHIVE);
+ scr_conBarColorAlpha = Cvar_Get ("scr_conBarColorAlpha", "0.3", CVAR_ARCHIVE, "test");
+ scr_conBarColorRed = Cvar_Get ("scr_conBarColorRed", "1", CVAR_ARCHIVE, "test");
+ scr_conBarColorBlue = Cvar_Get ("scr_conBarColorBlue", "1", CVAR_ARCHIVE, "test");
+ scr_conBarColorGreen = Cvar_Get ("scr_conBarColorGreen", "1", CVAR_ARCHIVE, "test");
- scr_conHeight = Cvar_Get ("scr_conHeight", "50", CVAR_ARCHIVE);
+ scr_conHeight = Cvar_Get ("scr_conHeight", "50", CVAR_ARCHIVE, "test");
- scr_conBarSize = Cvar_Get ("scr_conBarSize", "2", CVAR_ARCHIVE);
+ scr_conBarSize = Cvar_Get ("scr_conBarSize", "2", CVAR_ARCHIVE, "test");
// Done defining cvars for console colors
@@ -1183,7 +1183,7 @@ void Con_DrawSolidConsole( float frac ) {
re.SetColor( NULL );
}
-extern cvar_t *con_drawnotify;
+extern convar_t *con_drawnotify;
/*
==================
View
24 src/engine/client/cl_input.cpp
@@ -629,22 +629,22 @@ void IN_Help(void)
//==========================================================================
-cvar_t *cl_upspeed;
-cvar_t *cl_forwardspeed;
-cvar_t *cl_sidespeed;
+convar_t *cl_upspeed;
+convar_t *cl_forwardspeed;
+convar_t *cl_sidespeed;
-cvar_t *cl_yawspeed;
-cvar_t *cl_pitchspeed;
+convar_t *cl_yawspeed;
+convar_t *cl_pitchspeed;
-cvar_t *cl_run;
+convar_t *cl_run;
-cvar_t *cl_anglespeedkey;
+convar_t *cl_anglespeedkey;
-cvar_t *cl_recoilPitch;
+convar_t *cl_recoilPitch;
-cvar_t *cl_bypassMouseInput; // NERVE - SMF
+convar_t *cl_bypassMouseInput; // NERVE - SMF
-cvar_t *cl_doubletapdelay;
+convar_t *cl_doubletapdelay;
/*
================
@@ -1667,8 +1667,8 @@ void CL_InitInput(void)
Cmd_AddCommand ("-voiprecord", IN_VoipRecordUp);
#endif
- cl_nodelta = Cvar_Get("cl_nodelta", "0", 0);
- cl_debugMove = Cvar_Get("cl_debugMove", "0", 0);
+ cl_nodelta = Cvar_Get("cl_nodelta", "0", 0, "test");
+ cl_debugMove = Cvar_Get("cl_debugMove", "0", 0, "test");
}
View
32 src/engine/client/cl_irc.cpp
@@ -60,14 +60,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* IRC control cvars */
-cvar_t * cl_IRC_connect_at_startup;
-cvar_t * cl_IRC_server;
-cvar_t * cl_IRC_channel;
-cvar_t * cl_IRC_port;
-cvar_t * cl_IRC_override_nickname;
-cvar_t * cl_IRC_nickname;
-cvar_t * cl_IRC_kick_rejoin;
-cvar_t * cl_IRC_reconnect_delay;
+convar_t * cl_IRC_connect_at_startup;
+convar_t * cl_IRC_server;
+convar_t * cl_IRC_channel;
+convar_t * cl_IRC_port;
+convar_t * cl_IRC_override_nickname;
+convar_t * cl_IRC_nickname;
+convar_t * cl_IRC_kick_rejoin;
+convar_t * cl_IRC_reconnect_delay;
/*
@@ -2205,14 +2205,14 @@ CL_IRCSetup
==================
*/
void CL_OW_IRCSetup(void) {
- cl_IRC_connect_at_startup = Cvar_Get( "cl_IRC_connect_at_startup" , "0" , CVAR_ARCHIVE );
- cl_IRC_server = Cvar_Get( "cl_IRC_server" , "irc.freenode.org" , CVAR_ARCHIVE );
- cl_IRC_channel = Cvar_Get( "cl_IRC_channel" , "openwolf" , CVAR_ARCHIVE );
- cl_IRC_port = Cvar_Get( "cl_IRC_port" , "6667" , CVAR_ARCHIVE );
- cl_IRC_override_nickname = Cvar_Get( "cl_IRC_override_nickname" , "0" , CVAR_ARCHIVE );
- cl_IRC_nickname = Cvar_Get( "cl_IRC_nickname" , "" , CVAR_ARCHIVE );
- cl_IRC_kick_rejoin = Cvar_Get( "cl_IRC_kick_rejoin" , "0" , CVAR_ARCHIVE );
- cl_IRC_reconnect_delay = Cvar_Get( "cl_IRC_reconnect_delay" , "100" , CVAR_ARCHIVE );
+ cl_IRC_connect_at_startup = Cvar_Get( "cl_IRC_connect_at_startup" , "0" , CVAR_ARCHIVE, "test");
+ cl_IRC_server = Cvar_Get( "cl_IRC_server" , "irc.freenode.org" , CVAR_ARCHIVE, "test" );
+ cl_IRC_channel = Cvar_Get( "cl_IRC_channel" , "openwolf" , CVAR_ARCHIVE, "test" );
+ cl_IRC_port = Cvar_Get( "cl_IRC_port" , "6667" , CVAR_ARCHIVE, "test" );
+ cl_IRC_override_nickname = Cvar_Get( "cl_IRC_override_nickname" , "0" , CVAR_ARCHIVE, "test" );
+ cl_IRC_nickname = Cvar_Get( "cl_IRC_nickname" , "" , CVAR_ARCHIVE, "test" );
+ cl_IRC_kick_rejoin = Cvar_Get( "cl_IRC_kick_rejoin" , "0" , CVAR_ARCHIVE, "test" );
+ cl_IRC_reconnect_delay = Cvar_Get( "cl_IRC_reconnect_delay" , "100" , CVAR_ARCHIVE, "test" );
if ( cl_IRC_connect_at_startup->value )
CL_OW_InitIRC( );
View
433 src/engine/client/cl_main.cpp
@@ -55,7 +55,7 @@ Maryland 20850 USA.
#include "../sys/sys_loadlib.h"
#include "../sys/sys_local.h"
-cvar_t *cl_wavefilerecord;
+convar_t *cl_wavefilerecord;
#include "../qcommon/crypto.h"
@@ -64,138 +64,138 @@ cvar_t *cl_wavefilerecord;
#endif
#ifdef USE_MUMBLE
-cvar_t *cl_useMumble;
-cvar_t *cl_mumbleScale;
+convar_t *cl_useMumble;
+convar_t *cl_mumbleScale;
#endif
#ifdef USE_VOIP
-cvar_t *cl_voipUseVAD;
-cvar_t *cl_voipVADThreshold;
-cvar_t *cl_voipSend;
-cvar_t *cl_voipSendTarget;
-cvar_t *cl_voipGainDuringCapture;
-cvar_t *cl_voipCaptureMult;
-cvar_t *cl_voipShowMeter;
-cvar_t *cl_voipShowSender;
-cvar_t *cl_voip;
+convar_t *cl_voipUseVAD;
+convar_t *cl_voipVADThreshold;
+convar_t *cl_voipSend;
+convar_t *cl_voipSendTarget;
+convar_t *cl_voipGainDuringCapture;
+convar_t *cl_voipCaptureMult;
+convar_t *cl_voipShowMeter;
+convar_t *cl_voipShowSender;
+convar_t *cl_voip;
#endif
-cvar_t *cl_nodelta;
-cvar_t *cl_debugMove;
-
-cvar_t *cl_noprint;
-cvar_t *cl_motd;
-cvar_t *cl_autoupdate; // DHM - Nerve
-
-cvar_t *rcon_client_password;
-cvar_t *rconAddress;
-
-cvar_t *cl_timeout;
-cvar_t *cl_maxpackets;
-cvar_t *cl_packetdup;
-cvar_t *cl_timeNudge;
-cvar_t *cl_showTimeDelta;
-cvar_t *cl_freezeDemo;
-
-cvar_t *cl_shownet = NULL; // NERVE - SMF - This is referenced in msg.c and we need to make sure it is NULL
-cvar_t *cl_shownuments; // DHM - Nerve
-cvar_t *cl_visibleClients; // DHM - Nerve
-cvar_t *cl_showSend;
-cvar_t *cl_showServerCommands; // NERVE - SMF
-cvar_t *cl_timedemo;
-
-cvar_t *cl_aviFrameRate;
-cvar_t *cl_forceavidemo;
-
-cvar_t *cl_freelook;
-cvar_t *cl_sensitivity;
-cvar_t *cl_xbox360ControllerAvailable;
-
-cvar_t *cl_mouseAccelOffset;
-cvar_t *cl_mouseAccel;
-cvar_t *cl_mouseAccelStyle;
-cvar_t *cl_showMouseRate;
-
-cvar_t *m_pitch;
-cvar_t *m_yaw;
-cvar_t *m_forward;
-cvar_t *m_side;
-cvar_t *m_filter;
-
-cvar_t *j_pitch;
-cvar_t *j_yaw;
-cvar_t *j_forward;
-cvar_t *j_side;
-cvar_t *j_up;
-cvar_t *j_pitch_axis;
-cvar_t *j_yaw_axis;
-cvar_t *j_forward_axis;
-cvar_t *j_side_axis;
-cvar_t *j_up_axis;
-
-cvar_t *cl_activeAction;
-
-cvar_t *cl_autorecord;
-
-cvar_t *cl_motdString;
-
-cvar_t *cl_allowDownload;
-cvar_t *cl_wwwDownload;
-cvar_t *cl_conXOffset;
-cvar_t *cl_inGameVideo;
-
-cvar_t *cl_serverStatusResendTime;
-cvar_t *cl_trn;
-cvar_t *cl_missionStats;
-cvar_t *cl_waitForFire;
+convar_t *cl_nodelta;
+convar_t *cl_debugMove;
+
+convar_t *cl_noprint;
+convar_t *cl_motd;
+convar_t *cl_autoupdate; // DHM - Nerve
+
+convar_t *rcon_client_password;
+convar_t *rconAddress;
+
+convar_t *cl_timeout;
+convar_t *cl_maxpackets;
+convar_t *cl_packetdup;
+convar_t *cl_timeNudge;
+convar_t *cl_showTimeDelta;
+convar_t *cl_freezeDemo;
+
+convar_t *cl_shownet = NULL; // NERVE - SMF - This is referenced in msg.c and we need to make sure it is NULL
+convar_t *cl_shownuments; // DHM - Nerve
+convar_t *cl_visibleClients; // DHM - Nerve
+convar_t *cl_showSend;
+convar_t *cl_showServerCommands; // NERVE - SMF
+convar_t *cl_timedemo;
+
+convar_t *cl_aviFrameRate;
+convar_t *cl_forceavidemo;
+
+convar_t *cl_freelook;
+convar_t *cl_sensitivity;
+convar_t *cl_xbox360ControllerAvailable;
+
+convar_t *cl_mouseAccelOffset;
+convar_t *cl_mouseAccel;
+convar_t *cl_mouseAccelStyle;
+convar_t *cl_showMouseRate;
+
+convar_t *m_pitch;
+convar_t *m_yaw;
+convar_t *m_forward;
+convar_t *m_side;
+convar_t *m_filter;
+
+convar_t *j_pitch;
+convar_t *j_yaw;
+convar_t *j_forward;
+convar_t *j_side;
+convar_t *j_up;
+convar_t *j_pitch_axis;
+convar_t *j_yaw_axis;
+convar_t *j_forward_axis;
+convar_t *j_side_axis;
+convar_t *j_up_axis;
+
+convar_t *cl_activeAction;
+
+convar_t *cl_autorecord;
+
+convar_t *cl_motdString;
+
+convar_t *cl_allowDownload;
+convar_t *cl_wwwDownload;
+convar_t *cl_conXOffset;
+convar_t *cl_inGameVideo;
+
+convar_t *cl_serverStatusResendTime;
+convar_t *cl_trn;
+convar_t *cl_missionStats;
+convar_t *cl_waitForFire;
// NERVE - SMF - localization
-cvar_t *cl_language;
-cvar_t *cl_debugTranslation;
+convar_t *cl_language;
+convar_t *cl_debugTranslation;
// -NERVE - SMF
// DHM - Nerve :: Auto-Update
-cvar_t *cl_updateavailable;
-cvar_t *cl_updatefiles;
+convar_t *cl_updateavailable;
+convar_t *cl_updatefiles;
-cvar_t *cl_pubkeyID;
+convar_t *cl_pubkeyID;
// DHM - Nerve
-cvar_t *cl_authserver;
+convar_t *cl_authserver;
-cvar_t *cl_profile;
-cvar_t *cl_defaultProfile;
+convar_t *cl_profile;
+convar_t *cl_defaultProfile;
-cvar_t *cl_demorecording; // fretn
-cvar_t *cl_demofilename; // bani
-cvar_t *cl_demooffset; // bani
+convar_t *cl_demorecording; // fretn
+convar_t *cl_demofilename; // bani
+convar_t *cl_demooffset; // bani
-cvar_t *cl_waverecording; //bani
-cvar_t *cl_wavefilename; //bani
-cvar_t *cl_waveoffset; //bani
+convar_t *cl_waverecording; //bani
+convar_t *cl_wavefilename; //bani
+convar_t *cl_waveoffset; //bani
-cvar_t *cl_packetloss; //bani
-cvar_t *cl_packetdelay; //bani
+convar_t *cl_packetloss; //bani
+convar_t *cl_packetdelay; //bani
extern qboolean sv_cheats; //bani
-cvar_t *cl_consoleKeys;
-cvar_t *cl_consoleFont;
-cvar_t *cl_consoleFontSize;
-cvar_t *cl_consoleFontKerning;
-cvar_t *cl_consolePrompt;
+convar_t *cl_consoleKeys;
+convar_t *cl_consoleFont;
+convar_t *cl_consoleFontSize;
+convar_t *cl_consoleFontKerning;
+convar_t *cl_consolePrompt;
struct rsa_public_key public_key;
struct rsa_private_key private_key;
-cvar_t *cl_gamename;
-cvar_t *cl_altTab;
+convar_t *cl_gamename;
+convar_t *cl_altTab;
-static cvar_t *cl_renderer = NULL;
+static convar_t *cl_renderer = NULL;
static void *rendererLib = NULL;
// XreaL BEGIN
-cvar_t *cl_aviMotionJpeg;
+convar_t *cl_aviMotionJpeg;
// XreaL END
clientActive_t cl;
@@ -4742,120 +4742,117 @@ void CL_Init(void)
//
// register our variables
//
- cl_renderer = Cvar_Get("cl_renderer", "GL3,GL", CVAR_ARCHIVE|CVAR_LATCH);
+ cl_renderer = Cvar_Get("cl_renderer", "GL3,GL", CVAR_ARCHIVE|CVAR_LATCH, "test");
- cl_noprint = Cvar_Get("cl_noprint", "0", 0);
- cl_motd = Cvar_Get("cl_motd", "1", 0);
- cl_autoupdate = Cvar_Get("cl_autoupdate", "1", CVAR_ARCHIVE);
+ cl_noprint = Cvar_Get("cl_noprint", "0", 0, "test");
+ cl_motd = Cvar_Get("cl_motd", "1", 0, "test");
+ cl_autoupdate = Cvar_Get("cl_autoupdate", "1", CVAR_ARCHIVE, "test");
- cl_timeout = Cvar_Get("cl_timeout", "200", 0);
+ cl_timeout = Cvar_Get("cl_timeout", "200", 0, "test");
- cl_wavefilerecord = Cvar_Get("cl_wavefilerecord", "0", CVAR_TEMP);
+ cl_wavefilerecord = Cvar_Get("cl_wavefilerecord", "0", CVAR_TEMP, "test");
- cl_timeNudge = Cvar_Get("cl_timeNudge", "0", CVAR_TEMP);
- cl_shownet = Cvar_Get("cl_shownet", "0", CVAR_TEMP);
- cl_shownuments = Cvar_Get("cl_shownuments", "0", CVAR_TEMP);
- cl_visibleClients = Cvar_Get("cl_visibleClients", "0", CVAR_TEMP);
- cl_showServerCommands = Cvar_Get("cl_showServerCommands", "0", 0);
- cl_showSend = Cvar_Get("cl_showSend", "0", CVAR_TEMP);
- cl_showTimeDelta = Cvar_Get("cl_showTimeDelta", "0", CVAR_TEMP);
- cl_freezeDemo = Cvar_Get("cl_freezeDemo", "0", CVAR_TEMP);
- rcon_client_password = Cvar_Get("rconPassword", "", CVAR_TEMP);
- cl_activeAction = Cvar_Get("activeAction", "", CVAR_TEMP);
- cl_autorecord = Cvar_Get("cl_autorecord", "0", CVAR_TEMP);
+ cl_timeNudge = Cvar_Get("cl_timeNudge", "0", CVAR_TEMP, "test");
+ cl_shownet = Cvar_Get("cl_shownet", "0", CVAR_TEMP, "test");
+ cl_shownuments = Cvar_Get("cl_shownuments", "0", CVAR_TEMP, "test");
+ cl_visibleClients = Cvar_Get("cl_visibleClients", "0", CVAR_TEMP, "test");
+ cl_showServerCommands = Cvar_Get("cl_showServerCommands", "0", 0, "test");
+ cl_showSend = Cvar_Get("cl_showSend", "0", CVAR_TEMP, "test");
+ cl_showTimeDelta = Cvar_Get("cl_showTimeDelta", "0", CVAR_TEMP, "test");
+ cl_freezeDemo = Cvar_Get("cl_freezeDemo", "0", CVAR_TEMP, "test");
+ rcon_client_password = Cvar_Get("rconPassword", "", CVAR_TEMP, "test");
+ cl_activeAction = Cvar_Get("activeAction", "", CVAR_TEMP, "test");
+ cl_autorecord = Cvar_Get("cl_autorecord", "0", CVAR_TEMP, "test");
- cl_timedemo = Cvar_Get("timedemo", "0", 0);
- cl_forceavidemo = Cvar_Get("cl_forceavidemo", "0", 0);
- cl_aviFrameRate = Cvar_Get("cl_aviFrameRate", "25", CVAR_ARCHIVE);
+ cl_timedemo = Cvar_Get("timedemo", "0", 0, "test");
+ cl_forceavidemo = Cvar_Get("cl_forceavidemo", "0", 0, "test");
+ cl_aviFrameRate = Cvar_Get("cl_aviFrameRate", "25", CVAR_ARCHIVE, "test");
+ cl_aviMotionJpeg = Cvar_Get("cl_aviMotionJpeg", "1", CVAR_ARCHIVE, "test");
- // XreaL BEGIN
- cl_aviMotionJpeg = Cvar_Get("cl_aviMotionJpeg", "1", CVAR_ARCHIVE);
- // XreaL END
-
- rconAddress = Cvar_Get("rconAddress", "", 0);
+ rconAddress = Cvar_Get("rconAddress", "", 0, "test");
- cl_yawspeed = Cvar_Get("cl_yawspeed", "140", CVAR_ARCHIVE);
- cl_pitchspeed = Cvar_Get("cl_pitchspeed", "140", CVAR_ARCHIVE);
- cl_anglespeedkey = Cvar_Get("cl_anglespeedkey", "1.5", 0);
+ cl_yawspeed = Cvar_Get("cl_yawspeed", "140", CVAR_ARCHIVE, "test");
+ cl_pitchspeed = Cvar_Get("cl_pitchspeed", "140", CVAR_ARCHIVE, "test");
+ cl_anglespeedkey = Cvar_Get("cl_anglespeedkey", "1.5", 0, "test");
- cl_maxpackets = Cvar_Get("cl_maxpackets", "30", CVAR_ARCHIVE);
- cl_packetdup = Cvar_Get("cl_packetdup", "1", CVAR_ARCHIVE);
+ cl_maxpackets = Cvar_Get("cl_maxpackets", "30", CVAR_ARCHIVE, "test");
+ cl_packetdup = Cvar_Get("cl_packetdup", "1", CVAR_ARCHIVE, "test");
- cl_run = Cvar_Get("cl_run", "1", CVAR_ARCHIVE);
- cl_sensitivity = Cvar_Get("sensitivity", "5", CVAR_ARCHIVE);
- cl_mouseAccel = Cvar_Get("cl_mouseAccel", "0", CVAR_ARCHIVE);
- cl_freelook = Cvar_Get("cl_freelook", "1", CVAR_ARCHIVE);
+ cl_run = Cvar_Get("cl_run", "1", CVAR_ARCHIVE, "test");
+ cl_sensitivity = Cvar_Get("sensitivity", "5", CVAR_ARCHIVE, "test");
+ cl_mouseAccel = Cvar_Get("cl_mouseAccel", "0", CVAR_ARCHIVE, "test");
+ cl_freelook = Cvar_Get("cl_freelook", "1", CVAR_ARCHIVE, "test");
- cl_xbox360ControllerAvailable = Cvar_Get("in_xbox360ControllerAvailable", "0", CVAR_ROM);
+ cl_xbox360ControllerAvailable = Cvar_Get("in_xbox360ControllerAvailable", "0", CVAR_ROM, "test");
// 0: legacy mouse acceleration
// 1: new implementation
- cl_mouseAccelStyle = Cvar_Get( "cl_mouseAccelStyle", "0", CVAR_ARCHIVE );
+ cl_mouseAccelStyle = Cvar_Get( "cl_mouseAccelStyle", "0", CVAR_ARCHIVE, "test" );
// offset for the power function (for style 1, ignored otherwise)
// this should be set to the max rate value
- cl_mouseAccelOffset = Cvar_Get( "cl_mouseAccelOffset", "5", CVAR_ARCHIVE );
+ cl_mouseAccelOffset = Cvar_Get( "cl_mouseAccelOffset", "5", CVAR_ARCHIVE, "test" );
- cl_showMouseRate = Cvar_Get("cl_showmouserate", "0", 0);
+ cl_showMouseRate = Cvar_Get("cl_showmouserate", "0", 0, "test");
- cl_allowDownload = Cvar_Get("cl_allowDownload", "1", CVAR_ARCHIVE);
- cl_wwwDownload = Cvar_Get("cl_wwwDownload", "1", CVAR_USERINFO | CVAR_ARCHIVE);
+ cl_allowDownload = Cvar_Get("cl_allowDownload", "1", CVAR_ARCHIVE, "test");
+ cl_wwwDownload = Cvar_Get("cl_wwwDownload", "1", CVAR_USERINFO | CVAR_ARCHIVE, "test");
- cl_profile = Cvar_Get("cl_profile", "", CVAR_ROM);
- cl_defaultProfile = Cvar_Get("cl_defaultProfile", "", CVAR_ROM);
+ cl_profile = Cvar_Get("cl_profile", "", CVAR_ROM, "test");
+ cl_defaultProfile = Cvar_Get("cl_defaultProfile", "", CVAR_ROM, "test");
#if defined (USE_HTTP)
- cl_authserver = Cvar_Get( "cl_authserver", "localhost", CVAR_INIT );
+ cl_authserver = Cvar_Get( "cl_authserver", "localhost", CVAR_INIT, "test" );
#endif
// init autoswitch so the ui will have it correctly even
// if the cgame hasn't been started
// -NERVE - SMF - disabled autoswitch by default
- Cvar_Get("cg_autoswitch", "0", CVAR_ARCHIVE);
+ Cvar_Get("cg_autoswitch", "0", CVAR_ARCHIVE, "test");
// Rafael - particle switch
- Cvar_Get("cg_wolfparticles", "1", CVAR_ARCHIVE);
+ Cvar_Get("cg_wolfparticles", "1", CVAR_ARCHIVE, "test");
// done
- cl_conXOffset = Cvar_Get("cl_conXOffset", "3", 0);
- cl_inGameVideo = Cvar_Get("r_inGameVideo", "1", CVAR_ARCHIVE);
+ cl_conXOffset = Cvar_Get("cl_conXOffset", "3", 0, "test");
+ cl_inGameVideo = Cvar_Get("r_inGameVideo", "1", CVAR_ARCHIVE, "test");
- cl_serverStatusResendTime = Cvar_Get("cl_serverStatusResendTime", "750", 0);
+ cl_serverStatusResendTime = Cvar_Get("cl_serverStatusResendTime", "750", 0, "test");
// RF
- cl_recoilPitch = Cvar_Get("cg_recoilPitch", "0", CVAR_ROM);
+ cl_recoilPitch = Cvar_Get("cg_recoilPitch", "0", CVAR_ROM, "test");
- cl_bypassMouseInput = Cvar_Get("cl_bypassMouseInput", "0", 0); //CVAR_ROM ); // NERVE - SMF
+ cl_bypassMouseInput = Cvar_Get("cl_bypassMouseInput", "0", 0, "test"); //CVAR_ROM ); // NERVE - SMF
- cl_doubletapdelay = Cvar_Get("cl_doubletapdelay", "100", CVAR_ARCHIVE); // Arnout: double tap
+ cl_doubletapdelay = Cvar_Get("cl_doubletapdelay", "100", CVAR_ARCHIVE, "test"); // Arnout: double tap
#if defined (USE_HTTP)
// Initialize ui_logged_in to -1(not logged in)
// -2 - login in progress
// 0 - invalid login
// 1 - logged in
- Cvar_Get ("ui_logged_in", "-1", CVAR_ROM);
+ Cvar_Get ("ui_logged_in", "-1", CVAR_ROM, "test");
//force ui_logged in to -1 so we can't reset it on the command line
Cvar_Set( "ui_logged_in", "-1" );
#endif
- m_pitch = Cvar_Get("m_pitch", "0.022", CVAR_ARCHIVE);
- m_yaw = Cvar_Get("m_yaw", "0.022", CVAR_ARCHIVE);
- m_forward = Cvar_Get("m_forward", "0.25", CVAR_ARCHIVE);
- m_side = Cvar_Get("m_side", "0.25", CVAR_ARCHIVE);
- m_filter = Cvar_Get("m_filter", "0", CVAR_ARCHIVE);
-
- j_pitch = Cvar_Get ("j_pitch", "0.022", CVAR_ARCHIVE);
- j_yaw = Cvar_Get ("j_yaw", "-0.022", CVAR_ARCHIVE);
- j_forward = Cvar_Get ("j_forward", "-0.25", CVAR_ARCHIVE);
- j_side = Cvar_Get ("j_side", "0.25", CVAR_ARCHIVE);
- j_up = Cvar_Get ("j_up", "1", CVAR_ARCHIVE);
- j_pitch_axis = Cvar_Get ("j_pitch_axis", "3", CVAR_ARCHIVE);
- j_yaw_axis = Cvar_Get ("j_yaw_axis", "4", CVAR_ARCHIVE);
- j_forward_axis = Cvar_Get ("j_forward_axis", "1", CVAR_ARCHIVE);
- j_side_axis = Cvar_Get ("j_side_axis", "0", CVAR_ARCHIVE);
- j_up_axis = Cvar_Get ("j_up_axis", "2", CVAR_ARCHIVE);
+ m_pitch = Cvar_Get("m_pitch", "0.022", CVAR_ARCHIVE, "test");
+ m_yaw = Cvar_Get("m_yaw", "0.022", CVAR_ARCHIVE, "test");
+ m_forward = Cvar_Get("m_forward", "0.25", CVAR_ARCHIVE, "test");
+ m_side = Cvar_Get("m_side", "0.25", CVAR_ARCHIVE, "test");
+ m_filter = Cvar_Get("m_filter", "0", CVAR_ARCHIVE, "test");
+
+ j_pitch = Cvar_Get ("j_pitch", "0.022", CVAR_ARCHIVE, "test");
+ j_yaw = Cvar_Get ("j_yaw", "-0.022", CVAR_ARCHIVE, "test");
+ j_forward = Cvar_Get ("j_forward", "-0.25", CVAR_ARCHIVE, "test");
+ j_side = Cvar_Get ("j_side", "0.25", CVAR_ARCHIVE, "test");
+ j_up = Cvar_Get ("j_up", "1", CVAR_ARCHIVE, "test");
+ j_pitch_axis = Cvar_Get ("j_pitch_axis", "3", CVAR_ARCHIVE, "test");
+ j_yaw_axis = Cvar_Get ("j_yaw_axis", "4", CVAR_ARCHIVE, "test");
+ j_forward_axis = Cvar_Get ("j_forward_axis", "1", CVAR_ARCHIVE, "test");
+ j_side_axis = Cvar_Get ("j_side_axis", "0", CVAR_ARCHIVE, "test");
+ j_up_axis = Cvar_Get ("j_up_axis", "2", CVAR_ARCHIVE, "test");
Cvar_CheckRange(j_pitch_axis, 0, MAX_JOYSTICK_AXIS-1, qtrue);
Cvar_CheckRange(j_yaw_axis, 0, MAX_JOYSTICK_AXIS-1, qtrue);
@@ -4863,32 +4860,32 @@ void CL_Init(void)
Cvar_CheckRange(j_side_axis, 0, MAX_JOYSTICK_AXIS-1, qtrue);
Cvar_CheckRange(j_up_axis, 0, MAX_JOYSTICK_AXIS-1, qtrue);
- cl_motdString = Cvar_Get("cl_motdString", "", CVAR_ROM);
+ cl_motdString = Cvar_Get("cl_motdString", "", CVAR_ROM, "test");
// ~ and `, as keys and characters
- cl_consoleKeys = Cvar_Get("cl_consoleKeys", "~ ` 0x7e 0x60", CVAR_ARCHIVE);
+ cl_consoleKeys = Cvar_Get("cl_consoleKeys", "~ ` 0x7e 0x60", CVAR_ARCHIVE, "test");
- cl_consoleFont = Cvar_Get ("cl_consoleFont", "", CVAR_ARCHIVE | CVAR_LATCH);
- cl_consoleFontSize = Cvar_Get ("cl_consoleFontSize", "16", CVAR_ARCHIVE | CVAR_LATCH);
- cl_consoleFontKerning = Cvar_Get ("cl_consoleFontKerning", "0", CVAR_ARCHIVE);
- cl_consolePrompt = Cvar_Get ("cl_consolePrompt", "^3->", CVAR_ARCHIVE);
+ cl_consoleFont = Cvar_Get ("cl_consoleFont", "", CVAR_ARCHIVE | CVAR_LATCH, "test");
+ cl_consoleFontSize = Cvar_Get ("cl_consoleFontSize", "16", CVAR_ARCHIVE | CVAR_LATCH, "test");
+ cl_consoleFontKerning = Cvar_Get ("cl_consoleFontKerning", "0", CVAR_ARCHIVE, "test");
+ cl_consolePrompt = Cvar_Get ("cl_consolePrompt", "^3->", CVAR_ARCHIVE, "test");
- cl_gamename = Cvar_Get("cl_gamename", GAMENAME_FOR_MASTER, CVAR_TEMP);
- cl_altTab = Cvar_Get ("cl_altTab", "1", CVAR_ARCHIVE);
+ cl_gamename = Cvar_Get("cl_gamename", GAMENAME_FOR_MASTER, CVAR_TEMP, "test");
+ cl_altTab = Cvar_Get ("cl_altTab", "1", CVAR_ARCHIVE, "test");
//bani - make these cvars visible to cgame
- cl_demorecording = Cvar_Get("cl_demorecording", "0", CVAR_ROM);
- cl_demofilename = Cvar_Get("cl_demofilename", "", CVAR_ROM);
- cl_demooffset = Cvar_Get("cl_demooffset", "0", CVAR_ROM);
- cl_waverecording = Cvar_Get("cl_waverecording", "0", CVAR_ROM);
- cl_wavefilename = Cvar_Get("cl_wavefilename", "", CVAR_ROM);
- cl_waveoffset = Cvar_Get("cl_waveoffset", "0", CVAR_ROM);
+ cl_demorecording = Cvar_Get("cl_demorecording", "0", CVAR_ROM, "test");
+ cl_demofilename = Cvar_Get("cl_demofilename", "", CVAR_ROM, "test");
+ cl_demooffset = Cvar_Get("cl_demooffset", "0", CVAR_ROM, "test");
+ cl_waverecording = Cvar_Get("cl_waverecording", "0", CVAR_ROM, "test");
+ cl_wavefilename = Cvar_Get("cl_wavefilename", "", CVAR_ROM, "test");
+ cl_waveoffset = Cvar_Get("cl_waveoffset", "0", CVAR_ROM, "test");
//bani
- cl_packetloss = Cvar_Get("cl_packetloss", "0", CVAR_CHEAT);
- cl_packetdelay = Cvar_Get("cl_packetdelay", "0", CVAR_CHEAT);
+ cl_packetloss = Cvar_Get("cl_packetloss", "0", CVAR_CHEAT, "test");
+ cl_packetdelay = Cvar_Get("cl_packetdelay", "0", CVAR_CHEAT, "test");
- Cvar_Get("cl_maxPing", "800", CVAR_ARCHIVE);
+ Cvar_Get("cl_maxPing", "800", CVAR_ARCHIVE, "test");
#if 0 // Leftover from RTCW singleplayer days. All this is set in the gamecode now.
// NERVE - SMF
Cvar_Get("cg_drawCompass", "1", CVAR_ARCHIVE);
@@ -4917,39 +4914,39 @@ void CL_Init(void)
// -NERVE - SMF
#endif
// userinfo
- Cvar_Get("name", "UnnamedPlayer", CVAR_USERINFO | CVAR_ARCHIVE);
- Cvar_Get("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE); // Dushan - changed from 5000
- Cvar_Get("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE);
+ Cvar_Get("name", "UnnamedPlayer", CVAR_USERINFO | CVAR_ARCHIVE, "test");
+ Cvar_Get("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE, "test"); // Dushan - changed from 5000
+ Cvar_Get("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE, "test");
// Cvar_Get ("model", "american", CVAR_USERINFO | CVAR_ARCHIVE ); // temp until we have an skeletal american model
// Arnout - no need // Cvar_Get ("model", "multi", CVAR_USERINFO | CVAR_ARCHIVE );
// Arnout - no need // Cvar_Get ("head", "default", CVAR_USERINFO | CVAR_ARCHIVE );
// Arnout - no need // Cvar_Get ("color", "4", CVAR_USERINFO | CVAR_ARCHIVE );
// Arnout - no need // Cvar_Get ("handicap", "0", CVAR_USERINFO | CVAR_ARCHIVE );
// Cvar_Get ("sex", "male", CVAR_USERINFO | CVAR_ARCHIVE );
- Cvar_Get("cl_anonymous", "0", CVAR_USERINFO | CVAR_ARCHIVE);
+ Cvar_Get("cl_anonymous", "0", CVAR_USERINFO | CVAR_ARCHIVE, "test");
- cl_pubkeyID = Cvar_Get ("cl_pubkeyID", "1", CVAR_ARCHIVE | CVAR_USERINFO);
+ cl_pubkeyID = Cvar_Get ("cl_pubkeyID", "1", CVAR_ARCHIVE | CVAR_USERINFO, "test");
- Cvar_Get("password", "", CVAR_USERINFO);
- Cvar_Get("cg_predictItems", "1", CVAR_ARCHIVE);
+ Cvar_Get("password", "", CVAR_USERINFO, "test");
+ Cvar_Get("cg_predictItems", "1", CVAR_ARCHIVE, "test");
#ifdef USE_MUMBLE
- cl_useMumble = Cvar_Get ("cl_useMumble", "0", CVAR_ARCHIVE | CVAR_LATCH);
- cl_mumbleScale = Cvar_Get ("cl_mumbleScale", "0.0254", CVAR_ARCHIVE);
+ cl_useMumble = Cvar_Get ("cl_useMumble", "0", CVAR_ARCHIVE | CVAR_LATCH, "test");
+ cl_mumbleScale = Cvar_Get ("cl_mumbleScale", "0.0254", CVAR_ARCHIVE, "test");
#endif
#ifdef USE_VOIP
- cl_voipSend = Cvar_Get ("cl_voipSend", "0", 0);
- cl_voipSendTarget = Cvar_Get ("cl_voipSendTarget", "all", 0);
- cl_voipGainDuringCapture = Cvar_Get ("cl_voipGainDuringCapture", "0.2", 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);
- cl_voipShowSender = Cvar_Get ("cl_voipShowSender", "1", CVAR_ARCHIVE);
+ cl_voipSend = Cvar_Get ("cl_voipSend", "0", 0, "test");
+ cl_voipSendTarget = Cvar_Get ("cl_voipSendTarget", "all", 0, "test");
+ cl_voipGainDuringCapture = Cvar_Get ("cl_voipGainDuringCapture", "0.2", CVAR_ARCHIVE, "test");
+ cl_voipCaptureMult = Cvar_Get ("cl_voipCaptureMult", "2.0", CVAR_ARCHIVE, "test");
+ cl_voipUseVAD = Cvar_Get ("cl_voipUseVAD", "0", CVAR_ARCHIVE, "test");
+ cl_voipVADThreshold = Cvar_Get ("cl_voipVADThreshold", "0.25", CVAR_ARCHIVE, "test");
+ cl_voipShowMeter = Cvar_Get ("cl_voipShowMeter", "1", CVAR_ARCHIVE, "test");
+ cl_voipShowSender = Cvar_Get ("cl_voipShowSender", "1", CVAR_ARCHIVE, "test");
// This is a protocol version number.
- cl_voip = Cvar_Get ("cl_voip", "1", CVAR_USERINFO | CVAR_ARCHIVE | CVAR_LATCH);
+ cl_voip = Cvar_Get ("cl_voip", "1", CVAR_USERINFO | CVAR_ARCHIVE | CVAR_LATCH, "test");
Cvar_CheckRange( cl_voip, 0, 1, qtrue );
// If your data rate is too low, you'll get Connection Interrupted warnings
@@ -4966,25 +4963,25 @@ void CL_Init(void)
#endif
//----(SA) added
- Cvar_Get("cg_autoactivate", "1", CVAR_ARCHIVE);
+ Cvar_Get("cg_autoactivate", "1", CVAR_ARCHIVE, "test");
//----(SA) end
// cgame might not be initialized before menu is used
- Cvar_Get("cg_viewsize", "100", CVAR_ARCHIVE);
+ Cvar_Get("cg_viewsize", "100", CVAR_ARCHIVE, "test");
- Cvar_Get("cg_autoReload", "1", CVAR_ARCHIVE);
+ Cvar_Get("cg_autoReload", "1", CVAR_ARCHIVE, "test");
- cl_missionStats = Cvar_Get("g_missionStats", "0", CVAR_ROM);
- cl_waitForFire = Cvar_Get("cl_waitForFire", "0", CVAR_ROM);
+ cl_missionStats = Cvar_Get("g_missionStats", "0", CVAR_ROM, "test");
+ cl_waitForFire = Cvar_Get("cl_waitForFire", "0", CVAR_ROM, "test");
// NERVE - SMF - localization
- cl_language = Cvar_Get("cl_language", "0", CVAR_ARCHIVE);
- cl_debugTranslation = Cvar_Get("cl_debugTranslation", "0", 0);
+ cl_language = Cvar_Get("cl_language", "0", CVAR_ARCHIVE, "test");
+ cl_debugTranslation = Cvar_Get("cl_debugTranslation", "0", 0, "test");
// -NERVE - SMF
// DHM - Nerve :: Auto-update
- cl_updateavailable = Cvar_Get("cl_updateavailable", "0", CVAR_ROM);
- cl_updatefiles = Cvar_Get("cl_updatefiles", "", CVAR_ROM);
+ cl_updateavailable = Cvar_Get("cl_updateavailable", "0", CVAR_ROM, "test");
+ cl_updatefiles = Cvar_Get("cl_updatefiles", "", CVAR_ROM, "test");
Q_strncpyz(cls.autoupdateServerNames[0], AUTOUPDATE_SERVER1_NAME, MAX_QPATH);
Q_strncpyz(cls.autoupdateServerNames[1], AUTOUPDATE_SERVER2_NAME, MAX_QPATH);
@@ -5078,7 +5075,7 @@ void CL_Init(void)
Cvar_Set("cl_running", "1");
- Cvar_Get("cl_guid", "", CVAR_USERINFO | CVAR_ROM);
+ Cvar_Get("cl_guid", "", CVAR_USERINFO | CVAR_ROM, "test");
CL_UpdateGUID();
if (cl_pubkeyID->integer) {
View
22 src/engine/client/cl_scrn.cpp
@@ -38,11 +38,11 @@ Maryland 20850 USA.
qboolean scr_initialized; // ready to draw
-cvar_t *cl_timegraph;
-cvar_t *cl_debuggraph;
-cvar_t *cl_graphheight;
-cvar_t *cl_graphscale;
-cvar_t *cl_graphshift;
+convar_t *cl_timegraph;
+convar_t *cl_debuggraph;
+convar_t *cl_graphheight;
+convar_t *cl_graphscale;
+convar_t *cl_graphshift;
/*
================
@@ -565,11 +565,11 @@ SCR_Init
*/
void SCR_Init(void)
{
- cl_timegraph = Cvar_Get("timegraph", "0", CVAR_CHEAT);
- cl_debuggraph = Cvar_Get("debuggraph", "0", CVAR_CHEAT);
- cl_graphheight = Cvar_Get("graphheight", "32", CVAR_CHEAT);
- cl_graphscale = Cvar_Get("graphscale", "1", CVAR_CHEAT);
- cl_graphshift = Cvar_Get("graphshift", "0", CVAR_CHEAT);
+ cl_timegraph = Cvar_Get("timegraph", "0", CVAR_CHEAT, "test");
+ cl_debuggraph = Cvar_Get("debuggraph", "0", CVAR_CHEAT, "test");
+ cl_graphheight = Cvar_Get("graphheight", "32", CVAR_CHEAT, "test");
+ cl_graphscale = Cvar_Get("graphscale", "1", CVAR_CHEAT, "test");
+ cl_graphshift = Cvar_Get("graphshift", "0", CVAR_CHEAT, "test");
scr_initialized = qtrue;
}
@@ -695,7 +695,7 @@ void SCR_UpdateScreen(void)
if( uivm || com_dedicated->integer )
{
// XXX
- extern cvar_t* r_anaglyphMode;
+ extern convar_t* r_anaglyphMode;
// if running in stereo, we need to draw the frame twice
if(cls.glconfig.stereoEnabled) {
SCR_DrawScreenField( STEREO_LEFT );
View
10 src/engine/client/cl_ui.cpp
@@ -810,9 +810,9 @@ CLUI_GetCDKey
*/
static void CLUI_GetCDKey(char *buf, int buflen)
{
- cvar_t *fs;
+ convar_t *fs;
- fs = Cvar_Get("fs_game", "", CVAR_INIT | CVAR_SYSTEMINFO);
+ fs = Cvar_Get("fs_game", "", CVAR_INIT | CVAR_SYSTEMINFO, "test");
if(UI_usesUniqueCDKey() && fs && fs->string[0] != 0)
{
memcpy(buf, &cl_cdkey[16], 16);
@@ -833,9 +833,9 @@ CLUI_SetCDKey
*/
static void CLUI_SetCDKey(char *buf)
{
- cvar_t *fs;
+ convar_t *fs;
- fs = Cvar_Get("fs_game", "", CVAR_INIT | CVAR_SYSTEMINFO);
+ fs = Cvar_Get("fs_game", "", CVAR_INIT | CVAR_SYSTEMINFO, "test");
if(UI_usesUniqueCDKey() && fs && fs->string[0] != 0)
{
memcpy(&cl_cdkey[16], buf, 16);
@@ -955,7 +955,7 @@ intptr_t CL_UISystemCalls(intptr_t * args) {
Cvar_Reset((char*)VMA(1));
return 0;
case UI_CVAR_CREATE:
- Cvar_Get((char*)VMA(1), (char*)VMA(2), args[3]);
+ Cvar_Get((char*)VMA(1), (char*)VMA(2), args[3], (char*)VMA(4));
return 0;
case UI_CVAR_INFOSTRINGBUFFER:
Cvar_InfoStringBuffer(args[1], (char*)VMA(2), args[3]);
View
194 src/engine/client/client.h
@@ -402,117 +402,117 @@ extern struct rsa_private_key private_key;
//
// cvars
//
-extern cvar_t *cl_nodelta;
-extern cvar_t *cl_debugMove;
-extern cvar_t *cl_noprint;
-extern cvar_t *cl_timegraph;
-extern cvar_t *cl_maxpackets;
-extern cvar_t *cl_packetdup;
-extern cvar_t *cl_shownet;
-extern cvar_t *cl_shownuments; // DHM - Nerve
-extern cvar_t *cl_visibleClients; // DHM - Nerve
-extern cvar_t *cl_showSend;
-extern cvar_t *cl_showServerCommands; // NERVE - SMF
-extern cvar_t *cl_timeNudge;
-extern cvar_t *cl_showTimeDelta;
-extern cvar_t *cl_freezeDemo;
-
-extern cvar_t *cl_yawspeed;
-extern cvar_t *cl_pitchspeed;
-extern cvar_t *cl_run;
-extern cvar_t *cl_anglespeedkey;
-
-extern cvar_t *cl_recoilPitch; // RF
-
-extern cvar_t *cl_bypassMouseInput; // NERVE - SMF
-
-extern cvar_t *cl_doubletapdelay;
-
-extern cvar_t *cl_sensitivity;
-extern cvar_t *cl_freelook;
-
-extern cvar_t *cl_xbox360ControllerAvailable;
-
-extern cvar_t *cl_mouseAccel;
-extern cvar_t *cl_mouseAccelOffset;
-extern cvar_t *cl_mouseAccelStyle;
-extern cvar_t *cl_showMouseRate;
-
-extern cvar_t *m_pitch;
-extern cvar_t *m_yaw;
-extern cvar_t *m_forward;
-extern cvar_t *m_side;
-extern cvar_t *m_filter;
-
-extern cvar_t *j_pitch;
-extern cvar_t *j_yaw;
-extern cvar_t *j_forward;
-extern cvar_t *j_side;
-extern cvar_t *j_up;
-extern cvar_t *j_up_axis;
-extern cvar_t *j_pitch_axis;
-extern cvar_t *j_yaw_axis;
-extern cvar_t *j_forward_axis;
-extern cvar_t *j_side_axis;
-
-extern cvar_t *cl_IRC_connect_at_startup;
-extern cvar_t *cl_IRC_server;
-extern cvar_t *cl_IRC_channel;
-extern cvar_t *cl_IRC_port;
-extern cvar_t *cl_IRC_override_nickname;
-extern cvar_t *cl_IRC_nickname;
-extern cvar_t *cl_IRC_kick_rejoin;
-extern cvar_t *cl_IRC_reconnect_delay;
-
-extern cvar_t *cl_timedemo;
-
-extern cvar_t *cl_activeAction;
-extern cvar_t *cl_autorecord;
-
-extern cvar_t *cl_allowDownload;
-extern cvar_t *cl_conXOffset;
-extern cvar_t *cl_inGameVideo;
-extern cvar_t *cl_authserver;
-
-extern cvar_t *cl_missionStats;
-extern cvar_t *cl_waitForFire;
-extern cvar_t *cl_altTab;
+extern convar_t *cl_nodelta;
+extern convar_t *cl_debugMove;
+extern convar_t *cl_noprint;
+extern convar_t *cl_timegraph;
+extern convar_t *cl_maxpackets;
+extern convar_t *cl_packetdup;
+extern convar_t *cl_shownet;
+extern convar_t *cl_shownuments; // DHM - Nerve
+extern convar_t *cl_visibleClients; // DHM - Nerve
+extern convar_t *cl_showSend;
+extern convar_t *cl_showServerCommands; // NERVE - SMF
+extern convar_t *cl_timeNudge;
+extern convar_t *cl_showTimeDelta;
+extern convar_t *cl_freezeDemo;
+
+extern convar_t *cl_yawspeed;
+extern convar_t *cl_pitchspeed;
+extern convar_t *cl_run;
+extern convar_t *cl_anglespeedkey;
+
+extern convar_t *cl_recoilPitch; // RF
+
+extern convar_t *cl_bypassMouseInput; // NERVE - SMF
+
+extern convar_t *cl_doubletapdelay;
+
+extern convar_t *cl_sensitivity;
+extern convar_t *cl_freelook;
+
+extern convar_t *cl_xbox360ControllerAvailable;
+
+extern convar_t *cl_mouseAccel;
+extern convar_t *cl_mouseAccelOffset;
+extern convar_t *cl_mouseAccelStyle;
+extern convar_t *cl_showMouseRate;
+
+extern convar_t *m_pitch;
+extern convar_t *m_yaw;
+extern convar_t *m_forward;
+extern convar_t *m_side;
+extern convar_t *m_filter;
+
+extern convar_t *j_pitch;
+extern convar_t *j_yaw;
+extern convar_t *j_forward;
+extern convar_t *j_side;
+extern convar_t *j_up;
+extern convar_t *j_up_axis;
+extern convar_t *j_pitch_axis;
+extern convar_t *j_yaw_axis;
+extern convar_t *j_forward_axis;
+extern convar_t *j_side_axis;
+
+extern convar_t *cl_IRC_connect_at_startup;
+extern convar_t *cl_IRC_server;
+extern convar_t *cl_IRC_channel;
+extern convar_t *cl_IRC_port;
+extern convar_t *cl_IRC_override_nickname;
+extern convar_t *cl_IRC_nickname;
+extern convar_t *cl_IRC_kick_rejoin;
+extern convar_t *cl_IRC_reconnect_delay;
+
+extern convar_t *cl_timedemo;
+
+extern convar_t *cl_activeAction;
+extern convar_t *cl_autorecord;
+
+extern convar_t *cl_allowDownload;
+extern convar_t *cl_conXOffset;
+extern convar_t *cl_inGameVideo;
+extern convar_t *cl_authserver;
+
+extern convar_t *cl_missionStats;
+extern convar_t *cl_waitForFire;
+extern convar_t *cl_altTab;
// NERVE - SMF - localization
-extern cvar_t *cl_language;
+extern convar_t *cl_language;
// -NERVE - SMF
-extern cvar_t *cl_profile;
-extern cvar_t *cl_defaultProfile;
+extern convar_t *cl_profile;
+extern convar_t *cl_defaultProfile;
-extern cvar_t *cl_consoleKeys;
-extern cvar_t *cl_consoleFont;
-extern cvar_t *cl_consoleFontSize;
-extern cvar_t *cl_consoleFontKerning;
-extern cvar_t *cl_consolePrompt;
-extern cvar_t *cl_aviFrameRate;
-extern cvar_t *cl_aviMotionJpeg;
+extern convar_t *cl_consoleKeys;
+extern convar_t *cl_consoleFont;
+extern convar_t *cl_consoleFontSize;
+extern convar_t *cl_consoleFontKerning;
+extern convar_t *cl_consolePrompt;
+extern convar_t *cl_aviFrameRate;
+extern convar_t *cl_aviMotionJpeg;
-extern cvar_t *cl_pubkeyID;
+extern convar_t *cl_pubkeyID;
#ifdef USE_MUMBLE
-extern cvar_t *cl_useMumble;
-extern cvar_t *cl_mumbleScale;
+extern convar_t *cl_useMumble;
+extern convar_t *cl_mumbleScale;
#endif
#ifdef USE_VOIP
// cl_voipSendTarget is a string: "all" to broadcast to everyone, "none" to
// send to no one, or a comma-separated list of client numbers:
// "0,7,2,23" ... an empty string is treated like "all".
-extern cvar_t *cl_voipUseVAD;
-extern cvar_t *cl_voipVADThreshold;
-extern cvar_t *cl_voipSend;
-extern cvar_t *cl_voipSendTarget;
-extern cvar_t *cl_voipGainDuringCapture;
-extern cvar_t *cl_voipCaptureMult;
-extern cvar_t *cl_voipShowMeter;
-extern cvar_t *cl_voipShowSender;
-extern cvar_t *cl_voip;
+extern convar_t *cl_voipUseVAD;
+extern convar_t *cl_voipVADThreshold;
+extern convar_t *cl_voipSend;
+extern convar_t *cl_voipSendTarget;
+extern convar_t *cl_voipGainDuringCapture;
+extern convar_t *cl_voipCaptureMult;
+extern convar_t *cl_voipShowMeter;
+extern convar_t *cl_voipShowSender;
+extern convar_t *cl_voip;
#endif
//bani
View
2  src/engine/client/ui_api.h
@@ -278,7 +278,7 @@ void trap_Cvar_VariableStringBuffer( const char *var_name, char *buffer, int buf
void trap_Cvar_LatchedVariableStringBuffer(const char *var_name, char *buffer, int bufsize);
void trap_Cvar_SetValue(const char *var_name, float value);
void trap_Cvar_Reset(const char *name);
-void trap_Cvar_Create(const char *var_name, const char *var_value, int flags);
+void trap_Cvar_Create(const char *var_name, const char *var_value, int flags, const char *var_desc );
void trap_Cvar_InfoStringBuffer(int bit, char *buffer, int bufsize);
int trap_Argc(void);
void trap_Argv(int n, char *buffer, int bufferLength);
View
2  src/engine/cm/CollisionModel_files.cpp
@@ -248,7 +248,7 @@ void idCollisionModelManagerLocal::WriteCollisionModelsToFile( const char *filen
name = filename;
name.SetFileExtension( CM_FILE_EXT );
- Com_Printf( "writing %s\n", name.c_str() );
+ Com_Printf( "idCollisionModelManagerLocal::WriteCollisionModelsToFile: %s\n", name.c_str() );
// _D3XP was saving to fs_cdpath
fp = FS_FOpenFileWrite( name );
if ( !fp ) {
View
4 src/engine/cm/CollisionModel_load.cpp
@@ -127,13 +127,13 @@ void idCollisionModelManagerLocal::LoadProcBSP( const char *name ) {
filename.SetFileExtension( PROC_FILE_EXT );
src = new idLexer( filename, LEXFL_NOSTRINGCONCAT | LEXFL_NODOLLARPRECOMPILE );
if ( !src->IsLoaded() ) {
- Com_Warning( "idCollisionModelManagerLocal::LoadProcBSP: couldn't load %s", filename.c_str() );
+ Com_Warning( "idCollisionModelManagerLocal::LoadProcBSP: couldn't load %s\n", filename.c_str() );
delete src;
return;
}
if ( !src->ReadToken( &token ) || token.Icmp( PROC_FILE_ID ) ) {
- Com_Warning( "idCollisionModelManagerLocal::LoadProcBSP: bad id '%s' instead of '%s'", token.c_str(), PROC_FILE_ID );
+ Com_Warning( "idCollisionModelManagerLocal::LoadProcBSP: bad id '%s' instead of '%s'\n", token.c_str(), PROC_FILE_ID );
delete src;
return;
}
View
10 src/engine/cm/CollisionModel_q3BSP.cpp
@@ -121,7 +121,7 @@ cm_model_t *idCollisionModelManagerLocal::CollisionModelForBSPSubModel( int inde
cm_model_t *model;
idPlane plane;
idBounds bounds;
- bool collisionSurface;
+// bool collisionSurface;
dsurface_t *surf;
idMaterial *surfShader = this->declManager_FindMaterial("defaultShader");
@@ -221,10 +221,12 @@ void idCollisionModelManagerLocal::BuildModelsBSP( const char *fname ) {
if ( 1 || !LoadCollisionModelFile( fname, 0 ) ) {
dheader_t *h;
+ int length = FS_ReadFile( fname, (void **)&h );
dplane_t *planes = (dplane_t *)(((byte*)h) + h->lumps[LUMP_PLANES].fileofs);
dnode_t *nodes = (dnode_t *)(((byte*)h) + h->lumps[LUMP_NODES].fileofs);
int numNodes = h->lumps[LUMP_NODES].filelen / sizeof(dnode_t);
+
// load the nodes from bsp for data optimisation
ParseBSPNodes(nodes,numNodes,planes);
@@ -236,7 +238,7 @@ void idCollisionModelManagerLocal::BuildModelsBSP( const char *fname ) {
dsurface_t *surfs = (dsurface_t *)(((byte*)h) + h->lumps[LUMP_SURFACES].fileofs);
int *indexes = (int *)(((byte*)h) + h->lumps[LUMP_DRAWINDEXES].fileofs);
- ///convert brushes and patches to collision data
+ // convert brushes and patches to collision data
for ( int i = 0; i < numSubModels; i++ ) {
dmodel_t *in = models + i;
@@ -246,7 +248,7 @@ void idCollisionModelManagerLocal::BuildModelsBSP( const char *fname ) {
}
this->models[numModels] = CollisionModelForBSPSubModel( i, in, brushes, brushSides, planes, verts, surfs, indexes );
if ( this->models[numModels] == 0) {
- //Com_FatalError("CollisionModelForBSPSubModel faield\n");
+ //Com_FatalError("CollisionModelForBSPSubModel failed\n");
}
numModels++;
}
@@ -267,6 +269,6 @@ void idCollisionModelManagerLocal::BuildModelsBSP( const char *fname ) {
Com_Printf( "collision data:\n" );
Com_Printf( "%6i models\n", numModels );
PrintModelInfo( &model );
- Com_Printf( "%.0f msec to load collision data.\n", timer.Milliseconds() );
+ Com_Printf( "%i msec to load collision data.\n", Sys_Milliseconds() );
}
View
30 src/engine/database/database.h
@@ -31,21 +31,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef ET_MYSQL
//cvars
-extern cvar_t *db_backend;
-extern cvar_t *db_statusmaster;
-extern cvar_t *db_statusslave;
-
-extern cvar_t *db_addressMaster;
-extern cvar_t *db_portMaster;
-extern cvar_t *db_usernameMaster;
-extern cvar_t *db_passwordMaster;
-extern cvar_t *db_databaseMaster;
-
-extern cvar_t *db_addressSlave;
-extern cvar_t *db_portSlave;
-extern cvar_t *db_usernameSlave;
-extern cvar_t *db_passwordSlave;
-extern cvar_t *db_databaseSlave;
+extern convar_t *db_backend;
+extern convar_t *db_statusmaster;
+extern convar_t *db_statusslave;
+
+extern convar_t *db_addressMaster;
+extern convar_t *db_portMaster;
+extern convar_t *db_usernameMaster;
+extern convar_t *db_passwordMaster;
+extern convar_t *db_databaseMaster;
+
+extern convar_t *db_addressSlave;
+extern convar_t *db_portSlave;
+extern convar_t *db_usernameSlave;
+extern convar_t *db_passwordSlave;
+extern convar_t *db_databaseSlave;
//databse interface object
View
56 src/engine/database/db_main.cpp
@@ -27,24 +27,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef ET_MYSQL
//cvars
-cvar_t *db_enable;
-cvar_t *db_backend;
-cvar_t *db_statusmaster;
-cvar_t *db_statusslave;
+convar_t *db_enable;
+convar_t *db_backend;
+convar_t *db_statusmaster;
+convar_t *db_statusslave;
// MySQL Master Server related
-cvar_t *db_addressMaster;
-cvar_t *db_portMaster;
-cvar_t *db_usernameMaster;
-cvar_t *db_passwordMaster;
-cvar_t *db_databaseMaster;
+convar_t *db_addressMaster;
+convar_t *db_portMaster;
+convar_t *db_usernameMaster;
+convar_t *db_passwordMaster;
+convar_t *db_databaseMaster;
// MySQL Slave Server Related
-cvar_t *db_addressSlave;
-cvar_t *db_portSlave;
-cvar_t *db_usernameSlave;
-cvar_t *db_passwordSlave;
-cvar_t *db_databaseSlave;
+convar_t *db_addressSlave;
+convar_t *db_portSlave;
+convar_t *db_usernameSlave;
+convar_t *db_passwordSlave;
+convar_t *db_databaseSlave;
static dbinterface_t dbi;
@@ -76,24 +76,24 @@ void OW_Init( void ) {
Com_Printf( "------ Initializing Database ------\n" );
- db_enable = Cvar_Get( "db_enable", "1", CVAR_SERVERINFO | CVAR_ARCHIVE );
- db_backend = Cvar_Get( "db_backend", "MySQL", CVAR_ARCHIVE );
- db_statusmaster = Cvar_Get( "db_statusmaster", "0", CVAR_ARCHIVE );
- db_statusslave = Cvar_Get( "db_statusslave", "0", CVAR_ARCHIVE );
+ db_enable = Cvar_Get( "db_enable", "1", CVAR_SERVERINFO | CVAR_ARCHIVE, "test" );
+ db_backend = Cvar_Get( "db_backend", "MySQL", CVAR_ARCHIVE, "test" );
+ db_statusmaster = Cvar_Get( "db_statusmaster", "0", CVAR_ARCHIVE, "test" );
+ db_statusslave = Cvar_Get( "db_statusslave", "0", CVAR_ARCHIVE, "test" );
// MySQL Master Server
- db_addressMaster = Cvar_Get( "db_addressmaster", "localhost", CVAR_ARCHIVE );
- db_portMaster = Cvar_Get( "db_portmaster", "0", CVAR_ARCHIVE );
- db_usernameMaster = Cvar_Get( "db_usernamemaster", "root", CVAR_ARCHIVE );
- db_passwordMaster = Cvar_Get( "db_passwordmaster", "", CVAR_ARCHIVE );
- db_databaseMaster = Cvar_Get( "db_databasemaster", "testdb", CVAR_ARCHIVE );
+ db_addressMaster = Cvar_Get( "db_addressmaster", "localhost", CVAR_ARCHIVE, "test" );
+ db_portMaster = Cvar_Get( "db_portmaster", "0", CVAR_ARCHIVE, "test" );
+ db_usernameMaster = Cvar_Get( "db_usernamemaster", "root", CVAR_ARCHIVE, "test" );
+ db_passwordMaster = Cvar_Get( "db_passwordmaster", "", CVAR_ARCHIVE, "test" );
+ db_databaseMaster = Cvar_Get( "db_databasemaster", "testdb", CVAR_ARCHIVE, "test" );
// MySQL Slave Server
- db_addressSlave = Cvar_Get("db_addressslave", "localhost", CVAR_ARCHIVE);
- db_portSlave = Cvar_Get( "db_portslave", "0", CVAR_ARCHIVE );
- db_usernameSlave = Cvar_Get( "db_usernameslave", "root", CVAR_ARCHIVE );
- db_passwordSlave = Cvar_Get( "db_passwordslave", "", CVAR_ARCHIVE );
- db_databaseSlave = Cvar_Get( "db_databaseslave", "test", CVAR_ARCHIVE );
+ db_addressSlave = Cvar_Get("db_addressslave", "localhost", CVAR_ARCHIVE, "test");
+ db_portSlave = Cvar_Get( "db_portslave", "0", CVAR_ARCHIVE, "test" );
+ db_usernameSlave = Cvar_Get( "db_usernameslave", "root", CVAR_ARCHIVE, "test" );
+ db_passwordSlave = Cvar_Get( "db_passwordslave", "", CVAR_ARCHIVE, "test" );
+ db_databaseSlave = Cvar_Get( "db_databaseslave", "test", CVAR_ARCHIVE, "test" );
if( db_enable->integer == 0 ) {
Com_Printf( "Database Disabled.\n" );
View
2  src/engine/database/db_mysql.cpp
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include <mysql/mysql.h>
#endif
-extern cvar_t *db_enable;
+extern convar_t *db_enable;
#define MAX_QUERYS_RESULTS 100
View
2  src/engine/framework/KeyInput.h
@@ -36,6 +36,8 @@ Maryland 20850 USA.
#ifndef __KEYINPUT_H__
#define __KEYINPUT_H__
+#include "../qcommon/q_shared.h"
+
/*
===============================================================================
View
2  src/engine/idLib/Lib.cpp
@@ -59,7 +59,7 @@ void idLib::Init( void ) {
assert( sizeof( bool ) == 1 );
// initialize little/big endian conversion
- //Swap_Init();
+ Swap_Init();
// initialize memory manager
Mem_Init();
View
4 src/engine/idLib/precompiled.h
@@ -341,8 +341,8 @@ const int MAX_EXPRESSION_REGISTERS = 4096;
//#include "../ui/ListGUI.h"
//#include "../ui/UserInterface.h"
//
-//// collision detection system
-//#include "../cm/CollisionModel.h"
+// collision detection system
+#include "../cm/CollisionModel.h"
//
//// AAS files and manager
//#include "../tools/compilers/aas/AASFile.h"
View
8 src/engine/null/null_client.cpp
@@ -29,10 +29,10 @@ If you have questions concerning this license or the applicable additional terms
#include "../client/client.h"
-cvar_t *cl_shownet;
+convar_t *cl_shownet;
// TTimo: win32 dedicated
-cvar_t *cl_language;
+convar_t *cl_language;
void CL_Shutdown(void)
{
@@ -40,9 +40,9 @@ void CL_Shutdown(void)
void CL_Init(void)
{
- cl_shownet = Cvar_Get("cl_shownet", "0", CVAR_TEMP);
+ cl_shownet = Cvar_Get("cl_shownet", "0", CVAR_TEMP, "test");
// TTimo: localisation, prolly not any use in dedicated / null client
- cl_language = Cvar_Get("cl_language", "0", CVAR_ARCHIVE);
+ cl_language = Cvar_Get("cl_language", "0", CVAR_ARCHIVE, "test");
}
void CL_MouseEvent(int dx, int dy, int time)
View
17 src/engine/null/null_input.cpp
@@ -26,6 +26,7 @@ If you have questions concerning this license or the applicable additional terms
===========================================================================
*/
+#include "../framework/KeyInput.h"
#include "../client/client.h"
void IN_Init(void)
@@ -56,3 +57,19 @@ void IN_MouseEvent(int mstate)
void IN_Activate(qboolean active)
{
}
+
+void idKeyInput::Shutdown( void )
+{
+}
+
+void idKeyInput::KeyEvent( int key, int down, unsigned time )
+{
+}
+
+void idKeyInput::Init( void )
+{
+}
+
+void idKeyInput::CharEvent( int key )
+{
+}
View
28 src/engine/qcommon/cm_load.cpp
@@ -78,13 +78,13 @@ int c_pointcontents, c_traces, c_brush_traces, c_patch_traces, c_tri
byte *cmod_base;
#ifndef BSPC
-cvar_t *cm_noAreas;
-cvar_t *cm_noCurves;
-cvar_t *cm_forceTriangles;
-cvar_t *cm_playerCurveClip;
-cvar_t *cm_optimize;
-cvar_t *cm_showCurves;
-cvar_t *cm_showTriangles;
+convar_t *cm_noAreas;
+convar_t *cm_noCurves;
+convar_t *cm_forceTriangles;
+convar_t *cm_playerCurveClip;
+convar_t *cm_optimize;
+convar_t *cm_showCurves;
+convar_t *cm_showTriangles;
#endif
cmodel_t box_model;
@@ -869,13 +869,13 @@ void CM_LoadMapOLD(const char *name, qboolean clientload, int *checksum) {
}
#ifndef BSPC
- cm_noAreas = Cvar_Get("cm_noAreas", "0", CVAR_CHEAT);
- cm_noCurves = Cvar_Get("cm_noCurves", "0", CVAR_CHEAT);
- cm_forceTriangles = Cvar_Get("cm_forceTriangles", "0", CVAR_CHEAT | CVAR_LATCH);
- cm_playerCurveClip = Cvar_Get("cm_playerCurveClip", "1", CVAR_ARCHIVE | CVAR_CHEAT);
- cm_optimize = Cvar_Get("cm_optimize", "1", CVAR_CHEAT);
- cm_showCurves = Cvar_Get("cm_showCurves", "0", CVAR_CHEAT);
- cm_showTriangles = Cvar_Get("cm_showTriangles", "0", CVAR_CHEAT);
+ cm_noAreas = Cvar_Get("cm_noAreas", "0", CVAR_CHEAT, "test");
+ cm_noCurves = Cvar_Get("cm_noCurves", "0", CVAR_CHEAT, "test");
+ cm_forceTriangles = Cvar_Get("cm_forceTriangles", "0", CVAR_CHEAT | CVAR_LATCH, "test");
+ cm_playerCurveClip = Cvar_Get("cm_playerCurveClip", "1", CVAR_ARCHIVE | CVAR_CHEAT, "test");
+ cm_optimize = Cvar_Get("cm_optimize", "1", CVAR_CHEAT, "test");
+ cm_showCurves = Cvar_Get("cm_showCurves", "0", CVAR_CHEAT, "test");
+ cm_showTriangles = Cvar_Get("cm_showTriangles", "0", CVAR_CHEAT, "test");
#endif
Com_DPrintf("CM_LoadMap( %s, %i )\n", name, clientload);
View
14 src/engine/qcommon/cm_local.h
@@ -176,13 +176,13 @@ typedef struct {
extern clipMap_t cm;
extern int c_pointcontents;
extern int c_traces, c_brush_traces, c_patch_traces, c_trisoup_traces;
-extern cvar_t *cm_noAreas;
-extern cvar_t *cm_noCurves;
-extern cvar_t *cm_playerCurveClip;
-extern cvar_t *cm_forceTriangles;
-extern cvar_t *cm_optimize;
-extern cvar_t *cm_showCurves;
-extern cvar_t *cm_showTriangles;
+extern convar_t *cm_noAreas;
+extern convar_t *cm_noCurves;
+extern convar_t *cm_playerCurveClip;
+extern convar_t *cm_forceTriangles;
+extern convar_t *cm_optimize;
+extern convar_t *cm_showCurves;
+extern convar_t *cm_showTriangles;
// cm_test.c
View
14 src/engine/qcommon/cm_trace.cpp
@@ -563,7 +563,7 @@ void CM_TracePointThroughSurfaceCollide(traceWork_t * tw, const cSurfaceCollide_
const cPlane_t *planes;
const cFacet_t *facet;
int i, j, k;
- static cvar_t *cv;
+ static convar_t *cv;
if(!tw->isPoint) {
return;
@@ -617,7 +617,7 @@ void CM_TracePointThroughSurfaceCollide(traceWork_t * tw, const cSurfaceCollide_
if(j == facet->numBorders) {
// we hit this facet
if(!cv) {
- cv = Cvar_Get("r_debugSurfaceUpdate", "1", 0);
+ cv = Cvar_Get("r_debugSurfaceUpdate", "1", 0, "test");
}
if(cv->integer) {
@@ -703,7 +703,7 @@ void CM_TraceThroughSurfaceCollide(traceWork_t * tw, const cSurfaceCollide_t * s
cPlane_t *planes;
cFacet_t *facet;
vec3_t startp, endp;
- static cvar_t *cv;
+ static convar_t *cv;
if(!CM_BoundsIntersect(tw->bounds[0], tw->bounds[1], sc->bounds[0], sc->bounds[1])) {
return;
@@ -809,7 +809,7 @@ void CM_TraceThroughSurfaceCollide(traceWork_t * tw, const cSurfaceCollide_t * s
}
if(!cv) {
- cv = Cvar_Get("r_debugSurfaceUpdate", "1", 0);
+ cv = Cvar_Get("r_debugSurfaceUpdate", "1", 0, "test");
}
if(cv && cv->integer) {
debugSurfaceCollide = sc;
@@ -2100,7 +2100,7 @@ Called from the renderer
==================
*/
void CM_DrawDebugSurface(void (*drawPoly) (int color, int numPoints, float *points)) {
- static cvar_t *cv, *cv2;
+ static convar_t *cv, *cv2;
const cSurfaceCollide_t *pc;
cFacet_t *facet;
winding_t *w;
@@ -2108,7 +2108,7 @@ void CM_DrawDebugSurface(void (*drawPoly) (int color, int numPoints, float *poin
float plane[4];
if(!cv2) {
- cv2 = Cvar_Get("r_debugSurface", "0", 0);
+ cv2 = Cvar_Get("r_debugSurface", "0", 0, "test");
}
if(!debugSurfaceCollide) {
@@ -2116,7 +2116,7 @@ void CM_DrawDebugSurface(void (*drawPoly) (int color, int numPoints, float *poin
}
if(!cv) {
- cv = Cvar_Get("cm_debugSize", "2", 0);
+ cv = Cvar_Get("cm_debugSize", "2", 0, "test");
}
pc = debugSurfaceCollide;
View
24 src/engine/qcommon/cmd.cpp
@@ -400,14 +400,14 @@ static void Cmd_ExecFile( char *f )
COM_Compress (f);
- Cvar_Get( "arg_all", Cmd_ArgsFrom(2), CVAR_TEMP | CVAR_ROM | CVAR_USER_CREATED );
+ Cvar_Get( "arg_all", Cmd_ArgsFrom(2), CVAR_TEMP | CVAR_ROM | CVAR_USER_CREATED, "" );
Cvar_Set( "arg_all", Cmd_ArgsFrom(2) );
- Cvar_Get( "arg_count", va( "%i", Cmd_Argc() - 2 ), CVAR_TEMP | CVAR_ROM | CVAR_USER_CREATED );
+ Cvar_Get( "arg_count", va( "%i", Cmd_Argc() - 2 ), CVAR_TEMP | CVAR_ROM | CVAR_USER_CREATED, "" );
Cvar_Set( "arg_count", va( "%i", Cmd_Argc() - 2 ) );
for (i = Cmd_Argc() - 2; i; i--)
{
- Cvar_Get( va("arg_%i", i), Cmd_Argv( i + 1 ), CVAR_TEMP | CVAR_ROM | CVAR_USER_CREATED );
+ Cvar_Get( va("arg_%i", i), Cmd_Argv( i + 1 ), CVAR_TEMP | CVAR_ROM | CVAR_USER_CREATED, "" );
Cvar_Set( va("arg_%i", i), Cmd_Argv( i + 1 ) );
}
@@ -1502,3 +1502,21 @@ void Cmd_Init(void)
Cmd_AddCommand ("aliaslist", Cmd_AliasList_f);
Cmd_AddCommand ("clearaliases", Cmd_ClearAliases_f);
}
+
+
+/*
+============
+Cmd_Exists
+============
+*/
+qboolean Cmd_Exists( const char *cmd_name )
+{
+ cmd_function_t *cmd;
+
+ for( cmd = cmd_functions; cmd; cmd = cmd->next )
+ {
+ if( !idStr::Cmp( cmd_name, cmd->name ))
+ return qtrue;
+ }
+ return qfalse;
+}
View
206 src/engine/qcommon/common.cpp
@@ -78,68 +78,68 @@ static fileHandle_t logfile;
fileHandle_t com_journalFile; // events are written here
fileHandle_t com_journalDataFile; // config files are written here
-cvar_t *com_crashed = NULL; // ydnar: set in case of a crash, prevents CVAR_UNSAFE variables from being set from a cfg
+convar_t *com_crashed = NULL; // ydnar: set in case of a crash, prevents CVAR_UNSAFE variables from being set from a cfg
//bani - explicit NULL to make win32 teh happy
-cvar_t *com_ignorecrash = NULL; // bani - let experienced users ignore crashes, explicit NULL to make win32 teh happy
-cvar_t *com_pid; // bani - process id
-
-cvar_t *com_viewlog;
-cvar_t *com_speeds;
-cvar_t *com_developer;
-cvar_t *com_dedicated;
-cvar_t *com_timescale;
-cvar_t *com_fixedtime;
-cvar_t *com_dropsim; // 0.0 to 1.0, simulated packet drops
-cvar_t *com_journal;
-cvar_t *com_maxfps;
-cvar_t *com_timedemo;
-cvar_t *com_sv_running;
-cvar_t *com_cl_running;
-cvar_t *com_logfile; // 1 = buffer log, 2 = flush after each print
-cvar_t *com_showtrace;
-cvar_t *com_version;
-
-//cvar_t *com_blood;
-cvar_t *com_buildScript; // for automated data building scripts
-cvar_t *con_drawnotify;
-cvar_t *com_ansiColor;
-
-cvar_t *com_unfocused;
-cvar_t *com_minimized;
-
-cvar_t *com_introPlayed;
-cvar_t *com_logosPlaying;
-cvar_t *cl_paused;
-cvar_t *sv_paused;
+convar_t *com_ignorecrash = NULL; // bani - let experienced users ignore crashes, explicit NULL to make win32 teh happy
+convar_t *com_pid; // bani - process id
+
+convar_t *com_viewlog;
+convar_t *com_speeds;
+convar_t *com_developer;
+convar_t *com_dedicated;
+convar_t *com_timescale;
+convar_t *com_fixedtime;
+convar_t *com_dropsim; // 0.0 to 1.0, simulated packet drops
+convar_t *com_journal;
+convar_t *com_maxfps;
+convar_t *com_timedemo;
+convar_t *com_sv_running;
+convar_t *com_cl_running;
+convar_t *com_logfile; // 1 = buffer log, 2 = flush after each print
+convar_t *com_showtrace;
+convar_t *com_version;
+
+//convar_t *com_blood;
+convar_t *com_buildScript; // for automated data building scripts
+convar_t *con_drawnotify;
+convar_t *com_ansiColor;
+
+convar_t *com_unfocused;
+convar_t *com_minimized;
+
+convar_t *com_introPlayed;
+convar_t *com_logosPlaying;
+convar_t *cl_paused;
+convar_t *sv_paused;
#if defined (DEDICATED)
-cvar_t *cl_packetdelay;
+convar_t *cl_packetdelay;
#endif
-//cvar_t *sv_packetdelay;
-cvar_t *com_cameraMode;
-cvar_t *com_maxfpsUnfocused;
-cvar_t *com_maxfpsMinimized;
-cvar_t *com_abnormalExit;
+//convar_t *sv_packetdelay;
+convar_t *com_cameraMode;
+convar_t *com_maxfpsUnfocused;
+convar_t *com_maxfpsMinimized;
+convar_t *com_abnormalExit;
#if defined (USE_HTTP)
-cvar_t *com_webhost;
-cvar_t *com_sessionid;
+convar_t *com_webhost;
+convar_t *com_sessionid;
#endif
#if defined( _WIN32 ) && defined( _DEBUG )
-cvar_t *com_noErrorInterrupt;
+convar_t *com_noErrorInterrupt;
#endif
-cvar_t *com_recommendedSet;
+convar_t *com_recommendedSet;
-cvar_t *com_watchdog;
-cvar_t *com_watchdog_cmd;
+convar_t *com_watchdog;
+convar_t *com_watchdog_cmd;
// Rafael Notebook
-cvar_t *cl_notebook;
+convar_t *cl_notebook;
-cvar_t *com_hunkused; // Ridah
-cvar_t *com_protocol;
+convar_t *com_hunkused; // Ridah
+convar_t *com_protocol;
#if idx64
int (*Q_VMftol)(void);
@@ -575,7 +575,7 @@ void Com_StartupVariable(const char *match)
{
int i;
char *s;
- cvar_t *cv;
+ convar_t *cv;
for(i = 0; i < com_numConsoleLines; i++)
{
@@ -589,7 +589,7 @@ void Com_StartupVariable(const char *match)
if(!match || !strcmp(s, match))
{
Cvar_Set(s, Cmd_Argv(2));
- cv = Cvar_Get(s, "", 0);
+ cv = Cvar_Get(s, "", 0, "");
cv->flags |= CVAR_USER_CREATED;
// com_consoleLines[i] = 0;
}
@@ -924,7 +924,6 @@ int Com_RealTime(qtime_t * qtime)
return t;
}
-
/*
==============================================================================
@@ -1694,11 +1693,11 @@ void Com_InitSmallZoneMemory( void ) {
}
void Com_InitZoneMemory( void ) {
- cvar_t *cv;
+ convar_t *cv;
// allocate the random block zone
Com_StartupVariable("com_zoneMegs"); // config files and command line options haven't been taken in account yet
- cv = Cvar_Get( "com_zoneMegs", DEF_COMZONEMEGS_S, CVAR_INIT );
+ cv = Cvar_Get( "com_zoneMegs", DEF_COMZONEMEGS_S, CVAR_INIT, "test" );
if ( cv->integer < 20 ) {
s_zoneTotal = 1024 * 1024 * 16;
@@ -1802,7 +1801,7 @@ Com_InitZoneMemory
*/
void Com_InitHunkMemory( void )
{
- cvar_t *cv;
+ convar_t *cv;
int nMinAlloc;
char *pMsg = NULL;
@@ -1817,7 +1816,7 @@ void Com_InitHunkMemory( void )
}
// allocate the stack based hunk allocator
- cv = Cvar_Get( "com_hunkMegs", DEF_COMHUNKMEGS_S, CVAR_LATCH | CVAR_ARCHIVE );
+ cv = Cvar_Get( "com_hunkMegs", DEF_COMHUNKMEGS_S, CVAR_LATCH | CVAR_ARCHIVE, "test" );
// if we are not dedicated min allocation is 56, otherwise min is 1
if (com_dedicated && com_dedicated->integer) {
@@ -2144,7 +2143,7 @@ static byte *s_frameStackEnd = 0;
static void Hunk_FrameInit( void )
{
- int megs = Cvar_Get( "com_hunkFrameMegs", "1", CVAR_LATCH | CVAR_ARCHIVE )->integer;
+ int megs = Cvar_Get( "com_hunkFrameMegs", "1", CVAR_LATCH | CVAR_ARCHIVE, "test" )->integer;
size_t cb;
if( megs < 1 )
@@ -2255,7 +2254,7 @@ void Com_InitJournaling( void ) {
int i;
Com_StartupVariable( "journal" );
- com_journal = Cvar_Get ("journal", "0", CVAR_INIT);
+ com_journal = Cvar_Get ("journal", "0", CVAR_INIT, "test");
if ( !com_journal->integer ) {
if ( com_journal->string && com_journal->string[ 0 ] == '_' ) {
Com_Printf( "Replaying journaled events\n");
@@ -2808,12 +2807,12 @@ char cl_cdkey[34] = "123456789";
#endif
void Com_SetRecommended() {
- cvar_t *r_highQualityVideo, *com_recommended;
+ convar_t *r_highQualityVideo, *com_recommended;
qboolean goodVideo;
// will use this for recommended settings as well.. do i outside the lower check so it gets done even with command line stuff
- r_highQualityVideo = Cvar_Get("r_highQualityVideo", "1", CVAR_ARCHIVE);
- com_recommended = Cvar_Get("com_recommended", "-1", CVAR_ARCHIVE);
+ r_highQualityVideo = Cvar_Get("r_highQualityVideo", "1", CVAR_ARCHIVE, "test");
+ com_recommended = Cvar_Get("com_recommended", "-1", CVAR_ARCHIVE, "test");
goodVideo = (qboolean)(r_highQualityVideo && r_highQualityVideo->integer);
if(goodVideo)
@@ -3070,7 +3069,6 @@ void Com_Init(char *commandLine)
// cvar and command buffer management
Com_ParseCommandLine(commandLine);
- Swap_Init();
Cbuf_Init();
Com_InitZoneMemory();
@@ -3084,10 +3082,10 @@ void Com_Init(char *commandLine)
// bani: init this early
Com_StartupVariable("com_ignorecrash");
- com_ignorecrash = Cvar_Get("com_ignorecrash", "0", 0);
+ com_ignorecrash = Cvar_Get("com_ignorecrash", "0", 0, "test");
// ydnar: init crashed variable as early as possible
- com_crashed = Cvar_Get("com_crashed", "0", CVAR_TEMP);
+ com_crashed = Cvar_Get("com_crashed", "0", CVAR_TEMP, "test");
// bani: init pid
#ifdef _WIN32
@@ -3096,7 +3094,7 @@ void Com_Init(char *commandLine)
pid = getpid();
#endif
s = va("%d", pid);
- com_pid = Cvar_Get("com_pid", s, CVAR_ROM);
+ com_pid = Cvar_Get("com_pid", s, CVAR_ROM, "test");
// done early so bind command exists
idKeyInput::Init();
@@ -3184,13 +3182,13 @@ void Com_Init(char *commandLine)
Com_StartupVariable(NULL);
#ifdef UPDATE_SERVER
- com_dedicated = Cvar_Get( "dedicated", "1", CVAR_LATCH );
+ com_dedicated = Cvar_Get( "dedicated", "1", CVAR_LATCH, "test" );
#elif DEDICATED
// TTimo: default to internet dedicated, not LAN dedicated
- com_dedicated = Cvar_Get("dedicated", "2", CVAR_ROM);
+ com_dedicated = Cvar_Get("dedicated", "2", CVAR_ROM, "test");
Cvar_CheckRange(com_dedicated, 1, 2, qtrue);
#else
- com_dedicated = Cvar_Get("dedicated", "0", CVAR_LATCH);
+ com_dedicated = Cvar_Get("dedicated", "0", CVAR_LATCH, "test");
Cvar_CheckRange(com_dedicated, 0, 2, qtrue);
#endif
// allocate the stack based hunk allocator
@@ -3204,56 +3202,56 @@ void Com_Init(char *commandLine)
// init commands and vars
//
// Gordon: no need to latch this in ET, our recoil is framerate independant
- com_maxfps = Cvar_Get("com_maxfps", "125", CVAR_ARCHIVE /*|CVAR_LATCH */ );
-// com_blood = Cvar_Get ("com_blood", "1", CVAR_ARCHIVE); // Gordon: no longer used?
+ com_maxfps = Cvar_Get("com_maxfps", "125", CVAR_ARCHIVE /*|CVAR_LATCH */, "test" );
+// com_blood = Cvar_Get ("com_blood", "1", CVAR_ARCHIVE, "test"); // Gordon: no longer used?
- com_developer = Cvar_Get("developer", "0", CVAR_TEMP);
+ com_developer = Cvar_Get("developer", "0", CVAR_TEMP, "test");
- com_logfile = Cvar_Get("logfile", "0", CVAR_TEMP);
+ com_logfile = Cvar_Get("logfile", "0", CVAR_TEMP, "test");
- com_timescale = Cvar_Get("timescale", "1", CVAR_CHEAT | CVAR_SYSTEMINFO);
- com_fixedtime = Cvar_Get("fixedtime", "0", CVAR_CHEAT);
- com_showtrace = Cvar_Get("com_showtrace", "0", CVAR_CHEAT);
- com_dropsim = Cvar_Get("com_dropsim", "0", CVAR_CHEAT);
- com_viewlog = Cvar_Get("viewlog", "1", CVAR_CHEAT);
- com_speeds = Cvar_Get("com_speeds", "0", 0);
- com_timedemo = Cvar_Get("timedemo", "0", CVAR_CHEAT);
- com_cameraMode = Cvar_Get("com_cameraMode", "0", CVAR_CHEAT);