fix bug in saveconfig that caused config to get saved to weird random file names...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7893 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/fs.c b/fs.c
index 72475b697883d75bad6912f8205fd4b881ddd109..d37537a80726736360d7a5190261fdcff02dce52 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1179,7 +1179,7 @@ void FS_Rescan_f(void)
 FS_ChangeGameDirs
 ================
 */
-extern void Host_SaveConfig_f (void);
+extern void Host_SaveConfig (void);
 extern void Host_LoadConfig_f (void);
 qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing)
 {
@@ -1225,7 +1225,7 @@ qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean
        // halt demo playback to close the file
        CL_Disconnect();
 
-       Host_SaveConfig_f();
+       Host_SaveConfig();
 
        fs_numgamedirs = numgamedirs;
        for (i = 0;i < fs_numgamedirs;i++)

diff --git a/host.c b/host.c
index 5089a6a588730199bb464e6814f54ce434dac1b4..511ad1131f91d44e52f42ba437edd9e776fcffba 100644 (file)
--- a/host.c
+++ b/host.c
@@ -220,15 +220,9 @@ Host_SaveConfig_f
 Writes key bindings and archived cvars to config.cfg
 ===============
 */
-void Host_SaveConfig_f(void)
+void Host_SaveConfig_to(const char *file)
 {
        qfile_t *f;
-       const char *file = "config.cfg";
-
-       if(Cmd_Argc() >= 2) {
-               file = Cmd_Argv(1);
-               Con_Printf("Saving to %s\n", file);
-       }
 
 // dedicated servers initialize the host but don't parse and set the
 // config.cfg cvars
@@ -248,7 +242,21 @@ void Host_SaveConfig_f(void)
                FS_Close (f);
        }
 }
+void Host_SaveConfig(void)
+{
+       Host_SaveConfig_to("config.cfg");
+}
+void Host_SaveConfig_f(void)
+{
+       const char *file = "config.cfg";
 
+       if(Cmd_Argc() >= 2) {
+               file = Cmd_Argv(1);
+               Con_Printf("Saving to %s\n", file);
+       }
+
+       Host_SaveConfig_to(file);
+}
 
 /*
 ===============
@@ -1169,7 +1177,7 @@ void Host_Shutdown(void)
 #endif
        CL_Video_Shutdown();
 
-       Host_SaveConfig_f();
+       Host_SaveConfig();
 
        CDAudio_Shutdown ();
        S_Terminate ();