diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-11-01 19:14:29 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-11-01 19:14:29 +0000 |
| commit | 8fe48454bb15a8bdd51970615e0c0f5918bbfc18 (patch) | |
| tree | 4b4ac35cdaf8fd78f7e952b80f2fcfe813a53e24 | |
| parent | 14ef52c7c3413f8c61b50147dcd22f4ed7238078 (diff) | |
| download | mana-client-8fe48454bb15a8bdd51970615e0c0f5918bbfc18.tar.gz mana-client-8fe48454bb15a8bdd51970615e0c0f5918bbfc18.tar.bz2 mana-client-8fe48454bb15a8bdd51970615e0c0f5918bbfc18.tar.xz mana-client-8fe48454bb15a8bdd51970615e0c0f5918bbfc18.zip | |
Merged revisions 4300-4301 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r4300 | the_enemy | 2008-05-27 17:53:21 +0200 (Tue, 27 May 2008) | 1 line
Changed location of tmw directory on OSX
........
r4301 | peaveydk | 2008-05-28 18:06:48 +0200 (Wed, 28 May 2008) | 1 line
Change order of direction to up/down/right/left in Being::getSpriteDirection to fix inconsistancy of facing direction when walking diagonally.
........
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | src/being.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
3 files changed, 19 insertions, 2 deletions
@@ -409,6 +409,17 @@ to make linear and circular emitters work with particleEmitterSkip enabled. +2008-05-28 Dennis Friis <peavey@placid.dk> + + * src/being.cpp: Change order of direction to up/down/right/left in + Being::getSpriteDirection to fix inconsistancy of facing direction + when walking diagonally. + +2008-05-27 David Athay <ko2fan@gmail.com> + + * src/main.cpp, src/player_relations.cpp: Changed OSX tmw directory to a + more suitable location, and fixed compile error. + 2008-05-22 Roderic Morris <roderic@ccs.neu.edu> * src/gui/widgets/tab.cpp, src/utils/sha256.cpp: Fix compile errors diff --git a/src/being.cpp b/src/being.cpp index 69f873a2..bac66d48 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -436,10 +436,10 @@ void Being::setDirection(Uint8 direction) SpriteDirection dir; if (mFaceDirection & UP) dir = DIRECTION_UP; - else if (mFaceDirection & RIGHT) - dir = DIRECTION_RIGHT; else if (mFaceDirection & DOWN) dir = DIRECTION_DOWN; + else if (mFaceDirection & RIGHT) + dir = DIRECTION_RIGHT; else dir = DIRECTION_LEFT; mSpriteDirection = dir; diff --git a/src/main.cpp b/src/main.cpp index 628ad8dc..bf389d81 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -156,6 +156,12 @@ void initHomeDir() #if defined WIN32 if (!CreateDirectory(homeDir.c_str(), 0) && GetLastError() != ERROR_ALREADY_EXISTS) +#elif defined __APPLE__ + // Use Application Directory instead of .tmw + homeDir = std::string(PHYSFS_getUserDir()) + + "/Library/Application Support/The Mana World"; + if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) && + (errno != EEXIST)) #else // Checking if /home/user/.tmw folder exists. if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) && |