This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 450a83bce9aff60b4c1dc6dbdaa738f95c41a1b8 Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Sat Jan 25 18:22:07 2014 +0000 MP: Only calculate cl_guid on startup when using Punkbuster MD5 --- MP/code/client/cl_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c index 06bc9f6..0be5931 100644 --- a/MP/code/client/cl_main.c +++ b/MP/code/client/cl_main.c @@ -143,6 +143,7 @@ cvar_t *cl_updatefiles; cvar_t *cl_lanForcePackets; +cvar_t *cl_guid; cvar_t *cl_guidServerUniq; cvar_t *cl_consoleKeys; @@ -1438,7 +1439,10 @@ static void CL_UpdateGUID( const char *prefix, int prefix_len ) Cvar_Set( "cl_guid", Com_MD5File( QKEY_FILE, QKEY_SIZE, prefix, prefix_len ) ); #else - Cvar_Set( "cl_guid", Com_PBMD5File( cl_cdkey ) ); + if ( strcmp( cl_guid->string,"" ) == 0 ) + Cvar_Set( "cl_guid", Com_PBMD5File( cl_cdkey ) ); + else + return; #endif } @@ -4075,6 +4079,8 @@ void CL_Init( void ) { cl_lanForcePackets = Cvar_Get ("cl_lanForcePackets", "1", CVAR_ARCHIVE); + cl_guid = Cvar_Get( "cl_guid", "", CVAR_USERINFO | CVAR_ROM ); + cl_guidServerUniq = Cvar_Get ("cl_guidServerUniq", "1", CVAR_ARCHIVE); // ~ and `, as keys and characters @@ -4236,7 +4242,6 @@ void CL_Init( void ) { CL_InitTranslation(); // NERVE - SMF - localization CL_GenerateQKey(); - Cvar_Get( "cl_guid", "", CVAR_USERINFO | CVAR_ROM ); CL_UpdateGUID( NULL, 0 ); Com_Printf( "----- Client Initialization Complete -----\n" ); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
