- "baseq3" literal replacement patch (by Erik Auerswald) applied

- Commented setting of the cl_guid cvar because md5.c is not 64-bit safe.



git-svn-id: svn://svn.icculus.org/quake3/trunk@726 edf5b092-35ff-0310-97b2-ce42778d08ea

6 files changed, 7 insertions, 6 deletions

diff --git a/code/botlib/be_interface.c b/code/botlib/be_interface.c
index 067b257..7f30300 100644
--- a/code/botlib/be_interface.c
+++ b/code/botlib/be_interface.c
@@ -150,7 +150,7 @@ int Export_BotLibSetup(void)
 			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");
diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 8f9cbae..b502781 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -2549,7 +2549,8 @@ void CL_Init( void ) {
 	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" );
 }
diff --git a/code/game/bg_public.h b/code/game/bg_public.h
index 5568f44..ad5ab39 100644
--- a/code/game/bg_public.h
+++ b/code/game/bg_public.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 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
diff --git a/code/game/g_local.h b/code/game/g_local.h
index 6a30b71..74c55e6 100644
--- a/code/game/g_local.h
+++ b/code/game/g_local.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //==================================================================
 
 // the "gameversion" client command will print this plus compile date
-#define	GAMEVERSION	"baseq3"
+#define	GAMEVERSION	BASEGAME
 
 #define BODY_QUEUE_SIZE		8
 
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 400e048..f66ab23 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define CONSOLE_WINDOW_ICON   "ioq3 console"
 // 1.32 released 7-10-2002
 
+#define BASEGAME              "baseq3"
+
 #define MAX_TEAMNAME 32
 
 #ifdef _MSC_VER
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 65cc7be..ada4fe0 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -535,8 +535,6 @@ issues.
 
 #define	MAX_FILE_HANDLES	64
 
-#define BASEGAME "baseq3"
-
 qboolean FS_Initialized( void );
 
 void	FS_InitFilesystem ( void );