shithub: choc

Info  •  Files  •  Log  •  Branches

Fix bug with Hexen savedir set to "(null)" by setup tool (thanks
Alexandre Xavier).

Subversion-branch: /branches/v2-branch
Subversion-revision: 2447

--- a/src/setup/mainmenu.c

+++ b/src/setup/mainmenu.c

@@ -259,12 +259,12 @@

 static void InitConfig(void)

 {

+    M_SetConfigDir(NULL);

     InitBindings();

     SetChatMacroDefaults();

     SetPlayerNameDefault();

-    M_SetConfigDir(NULL);

     M_LoadDefaults();

 }

--- a/src/setup/mode.c

+++ b/src/setup/mode.c

@@ -128,6 +128,20 @@

     {

         M_BindVariable("savedir",           &savedir);

         M_BindVariable("messageson",        &showMessages);

+

+        // Hexen has a variable to control the savegame directory

+        // that is used.

+

+        savedir = M_GetSaveGameDir("hexen.wad");

+

+        // On Windows, hexndata\ is the default.

+

+        if (!strcmp(savedir, ""))

+        {

+            free(savedir);

+            savedir = malloc(10);

+            sprintf(savedir, "hexndata%c", DIR_SEPARATOR);

+        }

     }

     if (gamemission == strife)