summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2007-03-10 05:40:12 +0000
committerSimon Howard2007-03-10 05:40:12 +0000
commit82123dacf8eb687c67f2c0bbacaa536a773aa7eb (patch)
treed88d3aebfcc17d023d8b9864169b507761e7955d
parent80746e7900d91688eba6c2a3f8bb1164bdb3de73 (diff)
downloadchocolate-doom-82123dacf8eb687c67f2c0bbacaa536a773aa7eb.tar.gz
chocolate-doom-82123dacf8eb687c67f2c0bbacaa536a773aa7eb.tar.bz2
chocolate-doom-82123dacf8eb687c67f2c0bbacaa536a773aa7eb.zip
Ignore the HOME environment variable on Windows - just behave like
Vanilla Doom. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 853
-rw-r--r--setup/configfile.c5
-rw-r--r--src/m_misc.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/setup/configfile.c b/setup/configfile.c
index 8a3f700b..f2ec8d3d 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -80,6 +80,10 @@ void M_MakeDirectory(char *path)
void M_SetConfigDir(void)
{
+#ifndef _WIN32
+ // Ignore the HOME environment variable on Windows - just behave
+ // like Vanilla Doom.
+
char *homedir;
homedir = getenv("HOME");
@@ -98,6 +102,7 @@ void M_SetConfigDir(void)
M_MakeDirectory(configdir);
}
else
+#endif /* #ifndef _WIN32 */
{
#ifdef _WIN32
// when given the -cdrom option, save config+savegames in
diff --git a/src/m_misc.c b/src/m_misc.c
index 9aaa0322..6c4d6953 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -705,6 +705,10 @@ void M_LoadDefaults (void)
void M_SetConfigDir(void)
{
+#ifndef _WIN32
+ // Ignore the HOME environment variable on Windows - just behave
+ // like Vanilla Doom.
+
char *homedir;
homedir = getenv("HOME");
@@ -724,6 +728,7 @@ void M_SetConfigDir(void)
M_MakeDirectory(configdir);
}
else
+#endif /* #ifndef _WIN32 */
{
#ifdef _WIN32
//!