From: Brad A. <br...@us...> - 2011-11-25 18:51:20
|
gemrb: Infinity Engine emulator The branch master has been updated via b36492df952fbbf2d31664cd58453780246a875d (commit) via 5c8aa106feb51345db3fc2fa64e6467f85b0b54c (commit) Summary of changes: gemrb/core/Interface.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) from 45458bfb9d16c8ea9d8c636e16ab0dd75a5346d0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b36492df952fbbf2d31664cd58453780246a875d commit b36492df952fbbf2d31664cd58453780246a875d Merge: 5c8aa10 45458bf Author: Brad Allred <bra...@me...> Date: Fri Nov 25 11:50:39 2011 -0700 Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=5c8aa106feb51345db3fc2fa64e6467f85b0b54c commit 5c8aa106feb51345db3fc2fa64e6467f85b0b54c Author: Brad Allred <bra...@me...> Date: Fri Nov 25 11:49:18 2011 -0700 Interface: special UserDir consideration for iOS bundle/sandbox. diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp index ae307a1..3fbe5bc 100644 --- a/gemrb/core/Interface.cpp +++ b/gemrb/core/Interface.cpp @@ -2139,6 +2139,10 @@ bool Interface::LoadConfig(void) if (s) { strcpy( UserDir, s ); strcat( UserDir, "/."PACKAGE"/" ); +#if TARGET_OS_IPHONE + //we are in both a sandbox and a bundle + strcat( UserDir, "/"PACKAGE".app/"); +#endif } else { strcpy( UserDir, "./" ); } ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |