summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-02-17 02:40:14 +0300
committerAndrei Karas <akaras@inbox.ru>2012-02-17 02:40:14 +0300
commit2e84ac20fcf6ec69b40e19c4c6c428db04b70d85 (patch)
tree5764a2a7235160cf7c6efd910c80e27044eb900f
parent29118fed4a93dfc69370d20fb1459b86df57199e (diff)
downloadmv-2e84ac20fcf6ec69b40e19c4c6c428db04b70d85.tar.gz
mv-2e84ac20fcf6ec69b40e19c4c6c428db04b70d85.tar.bz2
mv-2e84ac20fcf6ec69b40e19c4c6c428db04b70d85.tar.xz
mv-2e84ac20fcf6ec69b40e19c4c6c428db04b70d85.zip
Add branding option for server list file name.
-rw-r--r--data/evol/evol.manaplus1
-rw-r--r--src/defaults.cpp1
-rw-r--r--src/gui/serverdialog.cpp6
3 files changed, 6 insertions, 2 deletions
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
index 63a963495..9c4743852 100644
--- a/data/evol/evol.manaplus
+++ b/data/evol/evol.manaplus
@@ -6,6 +6,7 @@
<option name="appIcon" value="evol/icons/evol-client"/>
<option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
<option name="onlineServerList" value="http://www.evolonline.org/serverlist.xml"/>
+ <option name="onlineServerFile" value="evol.xml"/>
<option name="defaultServer" value="world.evolonline.org"/>
<option name="defaultPort" value="6901"/>
<option name="defaultServerType" value="evol"/>
diff --git a/src/defaults.cpp b/src/defaults.cpp
index a439701a3..f670fd169 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -243,6 +243,7 @@ DefaultsData* getBrandingDefaults()
AddDEF(brandingData, "defaultServerType", "tmwathena");
AddDEF(brandingData, "onlineServerList",
"http://manaplus.evolonline.org/serverlist.xml");
+ AddDEF(brandingData, "onlineServerFile", "serverlist.xml");
AddDEF(brandingData, "appShort", "mana");
AddDEF(brandingData, "defaultUpdateHost", "");
AddDEF(brandingData, "helpPath", "");
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index ce61f6572..55eda908e 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -484,13 +484,15 @@ void ServerDialog::downloadServerList()
}
mDownload = new Net::Download(this, listFile, &downloadUpdate);
- mDownload->setFile(mDir + "/serverlist.xml");
+ mDownload->setFile(mDir + "/" + branding.getStringValue(
+ "onlineServerFile"));
mDownload->start();
}
void ServerDialog::loadServers(bool addNew)
{
- XML::Document doc(mDir + "/serverlist.xml", false);
+ XML::Document doc(mDir + "/" + branding.getStringValue(
+ "onlineServerFile"), false);
XmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "serverlist"))