summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2009-09-25 22:57:14 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-09-25 22:57:14 -0700
commitd5c7a33da297cd23aac2f53cba6770eacc73bf6f (patch)
tree0884f23cab1fae5b3701086a3f83e11b168cd24d
parenta0a30f16d0d40b4619b9cb979d8d7421c4089228 (diff)
downloadcrawl-ref-d5c7a33da297cd23aac2f53cba6770eacc73bf6f.tar.gz
crawl-ref-d5c7a33da297cd23aac2f53cba6770eacc73bf6f.zip
Revert "initfile.cc: move 'saves' and 'morgue' to appropriate Mac locations on Mac OS X"
This reverts commit a0a30f16d0d40b4619b9cb979d8d7421c4089228.
-rw-r--r--crawl-ref/source/initfile.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 201277c074..d3dda61ca3 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -656,17 +656,13 @@ void game_options::reset_options()
#if defined(SAVE_DIR_PATH)
save_dir = SAVE_DIR_PATH "/saves/";
morgue_dir = SAVE_DIR_PATH "/morgue/";
-#elif defined(OSX)
- std::string tmp_path_base = std::string(getenv("HOME")) + "/Library/Application Support/" CRAWL;
- save_dir = tmp_path_base + "/saves/";
- morgue_dir = tmp_path_base + "/morgue/";
-#elif !defined(DOS)
+ #elif !defined(DOS)
save_dir = "saves/";
#else
save_dir.clear();
#endif
-#if !defined(SHORT_FILE_NAMES) && !defined(SAVE_DIR_PATH) && !defined(OSX)
+#if !defined(SHORT_FILE_NAMES) && !defined(SAVE_DIR_PATH)
morgue_dir = "morgue/";
#endif