Permalink
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...
1 parent 1d0cbe2 commit 1b5c40e1f4efc2049175a3a1762cc4f1293e6587 @TheDushan committed Sep 6, 2012
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
@@ -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" />
@@ -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">
@@ -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;
/*
==================
@@ -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");
}
@@ -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( );
Oops, something went wrong.

0 comments on commit 1b5c40e

Please sign in to comment.