[iortcw] 34/497: MP: Set cl_guid to NO_GUID when no cdkey is present like vanilla client

[Simon McVittie]

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 27709017e8d2bd150a4c97a2db476cd2ebe2d2cf
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Tue Jan 28 12:53:23 2014 +0000

    MP: Set cl_guid to NO_GUID when no cdkey is present like vanilla client
---
 MP/code/client/cl_main.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
index 0be5931..87141b3 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
@@ -1439,7 +1439,14 @@ static void CL_UpdateGUID( const char *prefix, int prefix_len )
 		Cvar_Set( "cl_guid", Com_MD5File( QKEY_FILE, QKEY_SIZE,
 			prefix, prefix_len ) );
 #else
-	if ( strcmp( cl_guid->string,"" ) == 0 )
+	if ( !Q_stricmp( cl_cdkey, "                " )  )
+	{
+		Cvar_Set( "cl_guid", "NO_GUID" );
+
+		return;
+	}
+
+	if ( !Q_stricmp( cl_guid->string, "unknown" ) )
 		Cvar_Set( "cl_guid", Com_PBMD5File( cl_cdkey ) );
 	else
 		return;
@@ -4079,7 +4086,7 @@ void CL_Init( void ) {
 
 	cl_lanForcePackets = Cvar_Get ("cl_lanForcePackets", "1", CVAR_ARCHIVE);
 
-	cl_guid = Cvar_Get( "cl_guid", "", CVAR_USERINFO | CVAR_ROM );
+	cl_guid = Cvar_Get( "cl_guid", "unknown", CVAR_USERINFO | CVAR_ROM );
 
 	cl_guidServerUniq = Cvar_Get ("cl_guidServerUniq", "1", CVAR_ARCHIVE);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git