summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseeseekey <seeseekey@googlemail.com>2010-05-06 12:36:25 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-05-06 13:12:40 +0200
commit6be46ffba086d4b211efa3baaeb999d98f2c20e9 (patch)
tree64c04a72db7058467d9a524f8172da9e56c98f57
parentd9e5e4b2d683e1691d23e5dfee667ef20dc7e047 (diff)
downloadmana-6be46ffba086d4b211efa3baaeb999d98f2c20e9.tar.gz
mana-6be46ffba086d4b211efa3baaeb999d98f2c20e9.tar.bz2
mana-6be46ffba086d4b211efa3baaeb999d98f2c20e9.tar.xz
mana-6be46ffba086d4b211efa3baaeb999d98f2c20e9.zip
Remove hardcoded standard server urls
Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
-rw-r--r--src/client.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/client.cpp b/src/client.cpp
index b27caadc..aa48591f 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -389,7 +389,7 @@ Client::Client(const Options &options):
if (mCurrentServer.hostname.empty())
{
mCurrentServer.hostname = branding.getValue("defaultServer",
- "server.themanaworld.org").c_str();
+ "").c_str();
}
if (mCurrentServer.port == 0)
@@ -1095,8 +1095,7 @@ void Client::initConfiguration()
config.setValue("sfxVolume", 100);
config.setValue("musicVolume", 60);
config.setValue("fpslimit", 60);
- std::string defaultUpdateHost = branding.getValue("defaultUpdateHost",
- "http://updates.themanaworld.org");
+ std::string defaultUpdateHost = branding.getValue("defaultUpdateHost", "");
config.setValue("updatehost", defaultUpdateHost);
config.setValue("customcursor", true);
config.setValue("useScreenshotDirectorySuffix", true);
@@ -1139,8 +1138,7 @@ void Client::initUpdatesDir()
// If updatesHost is currently empty, fill it from config file
if (mUpdateHost.empty())
{
- mUpdateHost =
- config.getValue("updatehost", "http://updates.themanaworld.org/");
+ mUpdateHost = config.getValue("updatehost", "");
}
// Remove any trailing slash at the end of the update host