[PATCH] replacing "baseq3" by BASEGAME

[Erik Auerswald]

Hi,

Thilo has started to replace the string literal "baseq3" by the macro
BASEGAME. By moving the macro definition from qcommon/qcommon.h to
qcoomon/q_shared.h the remaining string literals can be eliminated.

Erik
-------------- next part --------------
Index: code/qcommon/q_shared.h
===================================================================
--- code/qcommon/q_shared.h	(revision 725)
+++ code/qcommon/q_shared.h	(working copy)
@@ -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
Index: code/qcommon/qcommon.h
===================================================================
--- code/qcommon/qcommon.h	(revision 725)
+++ code/qcommon/qcommon.h	(working copy)
@@ -535,8 +535,6 @@
 
 #define	MAX_FILE_HANDLES	64
 
-#define BASEGAME "baseq3"
-
 qboolean FS_Initialized( void );
 
 void	FS_InitFilesystem ( void );
Index: code/game/g_local.h
===================================================================
--- code/game/g_local.h	(revision 725)
+++ code/game/g_local.h	(working copy)
@@ -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
 
Index: code/game/bg_public.h
===================================================================
--- code/game/bg_public.h	(revision 725)
+++ code/game/bg_public.h	(working copy)
@@ -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
Index: code/botlib/be_interface.c
===================================================================
--- code/botlib/be_interface.c	(revision 725)
+++ code/botlib/be_interface.c	(working copy)
@@ -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");