diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 16:40:52 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 16:40:52 +0100 |
| commit | d6d906e2ad7b459882d628dfb07ed30ee36ed26b (patch) | |
| tree | adcdd0ef5bfbff1a8df77b1420bf2c877cd00c82 /src | |
| parent | 1a5af5210f640d900efac540d781a80c90959c22 (diff) | |
| parent | 4624f64d9bd89cd80030b2c0f143cfe4d2197229 (diff) | |
| download | mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.gz mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.bz2 mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.xz mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.zip | |
Merge branch '0.0.28'
Conflicts:
po/POTFILES.in
src/main.cpp
src/main.h
tmw.cbp
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 10 | ||||
| -rw-r--r-- | src/main.h | 2 | ||||
| -rw-r--r-- | src/winver.h | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index aa8e2805..54320433 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -259,7 +259,8 @@ void setUpdatesDir() */ void init_engine(const Options &options) { - homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw"; + if (homeDir.empty()) + homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw"; #if defined WIN32 if (!CreateDirectory(homeDir.c_str(), 0) && GetLastError() != ERROR_ALREADY_EXISTS) @@ -498,6 +499,7 @@ void printHelp() << _(" -d --data : Directory to load game data from") << std::endl << _(" -D --default : Bypass the login process with default settings") << std::endl << _(" -h --help : Display this help") << std::endl + << _(" -S --homedir : Directory to use as home directory") << std::endl << _(" -H --updatehost : Use this update host") << std::endl << _(" -p --playername : Login with this player") << std::endl << _(" -P --password : Login with this password") << std::endl @@ -518,7 +520,7 @@ void printVersion() void parseOptions(int argc, char *argv[], Options &options) { - const char *optstring = "hvud:U:P:Dp:C:H:"; + const char *optstring = "hvud:U:P:Dp:C:H:S:"; const struct option long_options[] = { { "configfile", required_argument, 0, 'C' }, @@ -527,6 +529,7 @@ void parseOptions(int argc, char *argv[], Options &options) { "playername", required_argument, 0, 'p' }, { "password", required_argument, 0, 'P' }, { "help", no_argument, 0, 'h' }, + { "homedir", required_argument, 0, 'S' }, { "updatehost", required_argument, 0, 'H' }, { "skipupdate", no_argument, 0, 'u' }, { "username", required_argument, 0, 'U' }, @@ -573,6 +576,9 @@ void parseOptions(int argc, char *argv[], Options &options) case 'v': options.printVersion = true; break; + case 'S': + homeDir = optarg; + break; } } } @@ -29,7 +29,7 @@ #elif defined WIN32 #include "winver.h" #elif defined __APPLE__ -#define PACKAGE_VERSION "0.0.28" +#define PACKAGE_VERSION "0.0.28.1" #endif #ifndef PKG_DATADIR diff --git a/src/winver.h b/src/winver.h index 45043409..5f0e1fb2 100644 --- a/src/winver.h +++ b/src/winver.h @@ -2,5 +2,5 @@ #define VER_MAJOR 0 #define VER_MINOR 0 #define VER_RELEASE 28 -#define VER_BUILD 0 -#define PACKAGE_VERSION "0.0.28" +#define VER_BUILD 1 +#define PACKAGE_VERSION "0.0.28.1" |