diff options
| author | Dennis Friis <peavey@inspircd.org> | 2009-05-21 01:36:50 +0200 |
|---|---|---|
| committer | Dennis Friis <peavey@inspircd.org> | 2009-05-21 01:36:50 +0200 |
| commit | 431e131ea8c38929d2ee61bd5066f856213882a1 (patch) | |
| tree | 908b9276590aadd44478b9de410d13be8c83e6b5 /src/main.cpp | |
| parent | 86a055d46df5a262fce0f76697cc3d54e75b19e1 (diff) | |
| parent | d82bc279c910a5ba2fd3764a41e680448c8ba1e8 (diff) | |
| download | mana-client-431e131ea8c38929d2ee61bd5066f856213882a1.tar.gz mana-client-431e131ea8c38929d2ee61bd5066f856213882a1.tar.bz2 mana-client-431e131ea8c38929d2ee61bd5066f856213882a1.tar.xz mana-client-431e131ea8c38929d2ee61bd5066f856213882a1.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp index f15eeccc..7c48e728 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -126,6 +126,12 @@ #include <sys/stat.h> #endif +#ifdef TWMSERV_SUPPORT +#define DEFAULT_PORT 9601 +#else +#define DEFAULT_PORT 6901 +#endif + namespace { struct SetupListener : public gcn::ActionListener @@ -347,11 +353,7 @@ static void initConfiguration(const Options &options) std::string defaultHost = branding.getValue("defaultServer", "server.themanaworld.org"); config.setValue("host", defaultHost); -#ifdef TWMSERV_SUPPORT - int defaultPort = (int)branding.getValue("defaultPort", 9601); -#else - int defaultPort = (int)branding.getValue("defaultPort", 6901); -#endif + int defaultPort = (int)branding.getValue("defaultPort", DEFAULT_PORT); config.setValue("port", defaultPort); config.setValue("hwaccel", false); #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL @@ -953,7 +955,7 @@ int main(int argc, char *argv[]) "server.themanaworld.org").c_str(); } if (options.serverPort == 0) { - loginData.port = (short) branding.getValue("defaultPort", 9601); + loginData.port = (short) branding.getValue("defaultPort", DEFAULT_PORT); } if (loginData.username.empty() && loginData.remember) { loginData.username = config.getValue("username", ""); |