shithub: choc

Download patch

ref: 0e3e4653f8df775fdd41e18e956f465fd334f275
parent: ef459ab99b18d26f502d423a31cd744f5bed6a88
author: Simon Howard <[email protected]>
date: Sun Jun 7 13:53:25 EDT 2009

Use home dir to store configuration and savegames under Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1573

--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -74,7 +74,7 @@
 
 
 // 
-// SetConfigDir:
+// M_SetConfigDir:
 //
 // Sets the location of the configuration directory, where configuration
 // files are stored - default.cfg, chocolate-doom.cfg, savegames, etc.
@@ -82,10 +82,12 @@
 
 void M_SetConfigDir(void)
 {
-#ifndef _WIN32
-    // Ignore the HOME environment variable on Windows - just behave
-    // like Vanilla Doom.
+#if !defined(_WIN32) || defined(_WIN32_WCE)
 
+    // Configuration settings are stored in ~/.chocolate-doom/,
+    // except on Windows, where we behave like Vanilla Doom and
+    // save in the current directory.
+
     char *homedir;
 
     homedir = getenv("HOME");
@@ -97,7 +99,8 @@
 
         configdir = malloc(strlen(homedir) + strlen(PACKAGE_TARNAME) + 5);
 
-        sprintf(configdir, "%s/.%s/", homedir, PACKAGE_TARNAME);
+        sprintf(configdir, "%s%c.%s%c", homedir, DIR_SEPARATOR,
+			                PACKAGE_TARNAME, DIR_SEPARATOR);
 
         // make the directory if it doesnt already exist
 
@@ -106,7 +109,7 @@
     else
 #endif /* #ifndef _WIN32 */
     {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
         // when given the -cdrom option, save config+savegames in 
         // c:\doomdata.  This only applies under Windows.
 
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -1313,10 +1313,12 @@
 
 void M_SetConfigDir(void)
 {
-#ifndef _WIN32
-    // Ignore the HOME environment variable on Windows - just behave
-    // like Vanilla Doom.
+#if !defined(_WIN32) || defined(_WIN32_WCE)
 
+    // Configuration settings are stored in ~/.chocolate-doom/,
+    // except on Windows, where we behave like Vanilla Doom and
+    // save in the current directory.
+
     char *homedir;
 
     homedir = getenv("HOME");
@@ -1338,7 +1340,7 @@
     else
 #endif /* #ifndef _WIN32 */
     {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
         //!
         // @platform windows
         // @vanilla