Rename config filename macros.

Define them directly in source code.

5 files changed, 20 insertions, 9 deletions

diff --git a/src/cl_main.c b/src/cl_main.c
index a49ea0f..15abc8a 100644
--- a/src/cl_main.c
+++ b/src/cl_main.c
@@ -3308,10 +3308,10 @@ static void CL_WriteConfig(void)
     qhandle_t f;
     qerror_t ret;
 
-    ret = FS_FOpenFile(COM_CONFIG_NAME, &f, FS_MODE_WRITE | FS_FLAG_TEXT);
+    ret = FS_FOpenFile(COM_CONFIG_CFG, &f, FS_MODE_WRITE | FS_FLAG_TEXT);
     if (!f) {
         Com_EPrintf("Couldn't open %s for writing: %s\n",
-                    COM_CONFIG_NAME, Q_ErrorString(ret));
+                    COM_CONFIG_CFG, Q_ErrorString(ret));
         return;
     }
 
diff --git a/src/common.c b/src/common.c
index 0641989..5a5fa75 100644
--- a/src/common.c
+++ b/src/common.c
@@ -2109,9 +2109,9 @@ void Qcommon_Init(int argc, char **argv)
 
     // execute configs: default.cfg may come from the packfile, but config.cfg
     // and autoexec.cfg must be real files within the game directory
-    Com_AddConfigFile(COM_DEFAULTCFG_NAME, 0);
-    Com_AddConfigFile(COM_CONFIG_NAME, FS_TYPE_REAL | FS_PATH_GAME);
-    Com_AddConfigFile(COM_AUTOEXECCFG_NAME, FS_TYPE_REAL | FS_PATH_GAME);
+    Com_AddConfigFile(COM_DEFAULT_CFG, 0);
+    Com_AddConfigFile(COM_CONFIG_CFG, FS_TYPE_REAL | FS_PATH_GAME);
+    Com_AddConfigFile(COM_AUTOEXEC_CFG, FS_TYPE_REAL | FS_PATH_GAME);
 
     Com_AddEarlyCommands(qtrue);
 
diff --git a/src/common.h b/src/common.h
index 9b8d6cd..424f37c 100644
--- a/src/common.h
+++ b/src/common.h
@@ -33,6 +33,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define APPLICATION     "q2proded"
 #endif
 
+#define COM_DEFAULT_CFG     "default.cfg"
+#define COM_AUTOEXEC_CFG    "autoexec.cfg"
+
+#ifdef _WIN32
+#define COM_CONFIG_CFG      "q2config.cfg"
+#else
+#define COM_CONFIG_CFG      "config.cfg"
+#endif
+
 /*
 ==============================================================
 
diff --git a/src/files.c b/src/files.c
index 01c6ff4..ad31b45 100644
--- a/src/files.c
+++ b/src/files.c
@@ -3490,9 +3490,9 @@ static void fs_game_changed(cvar_t *self)
 #endif
 
     // exec autoexec.cfg (must be a real file within the game directory)
-    ret = Cmd_ExecuteFile(COM_AUTOEXECCFG_NAME, FS_TYPE_REAL | FS_PATH_GAME);
+    ret = Cmd_ExecuteFile(COM_AUTOEXEC_CFG, FS_TYPE_REAL | FS_PATH_GAME);
     if (ret && ret != Q_ERR_NOENT) {
-        Com_WPrintf("Couldn't exec %s: %s\n", COM_AUTOEXECCFG_NAME, Q_ErrorString(ret));
+        Com_WPrintf("Couldn't exec %s: %s\n", COM_AUTOEXEC_CFG, Q_ErrorString(ret));
     }
 }
 
diff --git a/src/sys_unix.c b/src/sys_unix.c
index d24f836..30a1220 100644
--- a/src/sys_unix.c
+++ b/src/sys_unix.c
@@ -587,13 +587,15 @@ void Sys_Quit(void)
     exit(EXIT_SUCCESS);
 }
 
+#define SYS_SITE_CFG    "/etc/default/q2pro"
+
 void Sys_AddDefaultConfig(void)
 {
     FILE *fp;
     struct stat st;
     size_t len, r;
 
-    fp = fopen(SYS_SITECFG_NAME, "r");
+    fp = fopen(SYS_SITE_CFG, "r");
     if (!fp) {
         return;
     }
@@ -613,7 +615,7 @@ void Sys_AddDefaultConfig(void)
     fclose(fp);
 
     if (cmd_buffer.cursize) {
-        Com_Printf("Execing %s\n", SYS_SITECFG_NAME);
+        Com_Printf("Execing %s\n", SYS_SITE_CFG);
         Cbuf_Execute(&cmd_buffer);
     }
 }