r726 - in trunk/code: botlib client game qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2006-04-26 09:36:58 -0400 (Wed, 26 Apr 2006)
New Revision: 726

Modified:
   trunk/code/botlib/be_interface.c
   trunk/code/client/cl_main.c
   trunk/code/game/bg_public.h
   trunk/code/game/g_local.h
   trunk/code/qcommon/q_shared.h
   trunk/code/qcommon/qcommon.h
Log:
- "baseq3" literal replacement patch (by Erik Auerswald) applied
- Commented setting of the cl_guid cvar because md5.c is not 64-bit safe.



Modified: trunk/code/botlib/be_interface.c
===================================================================
--- trunk/code/botlib/be_interface.c	2006-04-26 11:31:18 UTC (rev 725)
+++ trunk/code/botlib/be_interface.c	2006-04-26 13:36:58 UTC (rev 726)
@@ -150,7 +150,7 @@
 			Com_sprintf(logfilename, sizeof(logfilename), "%s%c%s%cbotlib.log", homedir, PATH_SEP, gamedir, PATH_SEP);
 		}
 		else {
-			Com_sprintf(logfilename, sizeof(logfilename), "%s%cbaseq3%cbotlib.log", homedir, PATH_SEP, PATH_SEP);
+			Com_sprintf(logfilename, sizeof(logfilename), "%s%c" BASEGAME "%cbotlib.log", homedir, PATH_SEP, PATH_SEP);
 		}
 	} else {
 		Com_sprintf(logfilename, sizeof(logfilename), "botlib.log");

Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c	2006-04-26 11:31:18 UTC (rev 725)
+++ trunk/code/client/cl_main.c	2006-04-26 13:36:58 UTC (rev 726)
@@ -2549,7 +2549,8 @@
 	Cvar_Set( "cl_running", "1" );
 
 	CL_GenerateQKey();	
-	Cvar_Get("cl_guid", Com_MD5File(QKEY_FILE, 0), CVAR_USERINFO | CVAR_ROM);
+//	Uncomment this once md5.c has been made 64 bit-safe.
+//	Cvar_Get("cl_guid", Com_MD5File(QKEY_FILE, 0), CVAR_USERINFO | CVAR_ROM);
 
 	Com_Printf( "----- Client Initialization Complete -----\n" );
 }

Modified: trunk/code/game/bg_public.h
===================================================================
--- trunk/code/game/bg_public.h	2006-04-26 11:31:18 UTC (rev 725)
+++ trunk/code/game/bg_public.h	2006-04-26 13:36:58 UTC (rev 726)
@@ -25,7 +25,7 @@
 // because games can change separately from the main system version, we need a
 // second version that must match between game and cgame
 
-#define	GAME_VERSION		"baseq3-1"
+#define	GAME_VERSION		BASEGAME "-1"
 
 #define	DEFAULT_GRAVITY		800
 #define	GIB_HEALTH			-40

Modified: trunk/code/game/g_local.h
===================================================================
--- trunk/code/game/g_local.h	2006-04-26 11:31:18 UTC (rev 725)
+++ trunk/code/game/g_local.h	2006-04-26 13:36:58 UTC (rev 726)
@@ -29,7 +29,7 @@
 //==================================================================
 
 // the "gameversion" client command will print this plus compile date
-#define	GAMEVERSION	"baseq3"
+#define	GAMEVERSION	BASEGAME
 
 #define BODY_QUEUE_SIZE		8
 

Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h	2006-04-26 11:31:18 UTC (rev 725)
+++ trunk/code/qcommon/q_shared.h	2006-04-26 13:36:58 UTC (rev 726)
@@ -33,6 +33,8 @@
 #define CONSOLE_WINDOW_ICON   "ioq3 console"
 // 1.32 released 7-10-2002
 
+#define BASEGAME              "baseq3"
+
 #define MAX_TEAMNAME 32
 
 #ifdef _MSC_VER

Modified: trunk/code/qcommon/qcommon.h
===================================================================
--- trunk/code/qcommon/qcommon.h	2006-04-26 11:31:18 UTC (rev 725)
+++ trunk/code/qcommon/qcommon.h	2006-04-26 13:36:58 UTC (rev 726)
@@ -535,8 +535,6 @@
 
 #define	MAX_FILE_HANDLES	64
 
-#define BASEGAME "baseq3"
-
 qboolean FS_Initialized( void );
 
 void	FS_InitFilesystem ( void );