summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2007-06-03 21:42:42 +0000
committerDavid Athay <ko2fan@gmail.com>2007-06-03 21:42:42 +0000
commitc64ac878ee8cf33527abad76fc6bad546d49a2a8 (patch)
tree7b805ff268c5e7490acd786fbd14e1df8d49ea8e
parent778ca33725a8bfac629b405f0bd26cfefaf47caf (diff)
downloadmana-c64ac878ee8cf33527abad76fc6bad546d49a2a8.tar.gz
mana-c64ac878ee8cf33527abad76fc6bad546d49a2a8.tar.bz2
mana-c64ac878ee8cf33527abad76fc6bad546d49a2a8.tar.xz
mana-c64ac878ee8cf33527abad76fc6bad546d49a2a8.zip
Fixed screenshot save directory on OSX.v0.0.23
-rw-r--r--ChangeLog4
-rw-r--r--src/game.cpp2
-rw-r--r--src/main.cpp4
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 66252eeb..409addaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-03 David Athay <ko2fan@gmail.com>
+
+ * src/main.cpp, src/game.cpp: Fixed screenshot taking on OSX.
+
2007-06-03 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/CMakeLists.txt, src/Makefile.am, docs/Makefile.am: Added some
diff --git a/src/game.cpp b/src/game.cpp
index a51343dd..54474b1c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -320,6 +320,8 @@ bool saveScreenshot(SDL_Surface *screenshot)
filename.str("");
#if (defined __USE_UNIX98 || defined __FreeBSD__)
filename << PHYSFS_getUserDir() << ".tmw/";
+#elif defined __APPLE__
+ filename << PHYSFS_getUserDir() << "Desktop/";
#endif
filename << "TMW_Screenshot_" << screenshotCount << ".png";
testExists.open(filename.str().c_str(), std::ios::in);
diff --git a/src/main.cpp b/src/main.cpp
index 1b936e19..9c4a5cdf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@
#include <libxml/parser.h>
-#if (defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
+#ifndef WIN32
#include <cerrno>
#include <sys/stat.h>
#endif
@@ -150,7 +150,7 @@ void init_engine(const Options &options)
<< std::endl;
exit(1);
}
-
+
// Set log file
logger->setLogFile(homeDir + std::string("/tmw.log"));