summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-13 18:38:46 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-13 18:38:46 +0300
commit259c2b3803bcf1dd16759b6adad7ac9006c36f09 (patch)
tree8480e83b9d9d20f0dea814fb924adcfb38c55168 /src
parent15bdde570fb44bc3329d5c3628445b8323759c84 (diff)
downloadmv-259c2b3803bcf1dd16759b6adad7ac9006c36f09.tar.gz
mv-259c2b3803bcf1dd16759b6adad7ac9006c36f09.tar.bz2
mv-259c2b3803bcf1dd16759b6adad7ac9006c36f09.tar.xz
mv-259c2b3803bcf1dd16759b6adad7ac9006c36f09.zip
Add mirror support for servers list.
Diffstat (limited to 'src')
-rw-r--r--src/defaults.cpp4
-rw-r--r--src/gui/windows/serverdialog.cpp3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 39eae6711..8a4d70999 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -435,7 +435,9 @@ DefaultsData* getBrandingDefaults()
AddDEF("defaultPort", DEFAULT_PORT);
AddDEF("defaultServerType", "tmwathena");
AddDEF("onlineServerList",
- "http://manaplus.org/serverlist.xml");
+ "http://manaplus.org/serverlist1.xml");
+ AddDEF("onlineServerList2",
+ "http://www.manaplus.org/serverlist.xml");
AddDEF("onlineServerFile", "serverlistplus.xml");
AddDEF("appShort", "mana");
AddDEF("screenshots", "ManaPlus");
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 2f50a4744..6c72301ca 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -424,6 +424,7 @@ void ServerDialog::downloadServerList()
{
// Try to load the configuration value for the onlineServerList
std::string listFile = branding.getStringValue("onlineServerList");
+ std::string listFile2 = branding.getStringValue("onlineServerList2");
// Fall back to manaplus.org when neither branding
// nor config set it
@@ -440,6 +441,8 @@ void ServerDialog::downloadServerList()
&downloadUpdate, false, false, true);
mDownload->setFile(std::string(mDir).append("/").append(
branding.getStringValue("onlineServerFile")));
+ if (!listFile2.empty())
+ mDownload->addMirror(listFile2);
mDownload->start();
config.setValue("serverslistupdate", getDateString());