From d061339a3cccf6c3e0d6b70d5cafb0da30ea16c2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 8 Feb 2012 04:57:33 +0300
Subject: Add /setdrop command to help files.

---
 data/help/chatcommands.txt    | 1 +
 data/help/es/chatcommands.txt | 1 +
 data/help/ru/chatcommands.txt | 1 +
 3 files changed, 3 insertions(+)

(limited to 'data')

diff --git a/data/help/chatcommands.txt b/data/help/chatcommands.txt
index c62a9c2ed..8b55df827 100644
--- a/data/help/chatcommands.txt
+++ b/data/help/chatcommands.txt
@@ -35,6 +35,7 @@
     /addpriorityattack NAME - add monster to priority attack list.
     /removeattack NAME - remove monster from attack list.
     /addignoreattack NAME - add monster to ignore attack list.
+    /setdrop N - set drop counter to requested value.
 
 ##PTrade
 ##2
diff --git a/data/help/es/chatcommands.txt b/data/help/es/chatcommands.txt
index edf83709a..7f4fdeb1b 100644
--- a/data/help/es/chatcommands.txt
+++ b/data/help/es/chatcommands.txt
@@ -35,6 +35,7 @@
     /addpriorityattack NOMBRE - Agregar al monstruo especificado en NOMBRE a la lista de ataque prioritario.
     /removeattack NOMBRE - Remover al monstruo especificado de la lista de ataque.
     /addignoreattack NOMBRE - Agregar al monstruo especificado a la lista de criaturas ignorados.
+    /setdrop N - 
 
 ##PIntercambio
 ##2
diff --git a/data/help/ru/chatcommands.txt b/data/help/ru/chatcommands.txt
index 5a89b23f3..121940a6b 100644
--- a/data/help/ru/chatcommands.txt
+++ b/data/help/ru/chatcommands.txt
@@ -35,6 +35,7 @@
     /addpriorityattack NAME - добавить монстра в список приоритетной атаки.
     /removeattack NAME - удалить монстра из всех списков атаки.
     /addignoreattack NAME - добавить монстра в с список игнорирования атаки.
+    /setdrop N - устанавливает количество бросаемых объектов в указанное значение.
 
 ##PТорговля
 ##2
-- 
cgit v1.2.3-70-g09d2


From 4b9b559e914b7f46dccc6fd4db46f5f95e67e477 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 16 Feb 2012 21:53:59 +0300
Subject: Update liberation and mplus fonts.

---
 data/fonts/liberationsans-bold.ttf     | Bin 136664 -> 137284 bytes
 data/fonts/liberationsans.ttf          | Bin 139036 -> 139644 bytes
 data/fonts/liberationsansmono-bold.ttf | Bin 105428 -> 105616 bytes
 data/fonts/liberationsansmono.ttf      | Bin 108140 -> 108476 bytes
 data/fonts/mplus-1p-bold.ttf           | Bin 1295104 -> 1328708 bytes
 data/fonts/mplus-1p-regular.ttf        | Bin 1296064 -> 1329316 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'data')

diff --git a/data/fonts/liberationsans-bold.ttf b/data/fonts/liberationsans-bold.ttf
index 46928192e..e9a9aa5e5 100644
Binary files a/data/fonts/liberationsans-bold.ttf and b/data/fonts/liberationsans-bold.ttf differ
diff --git a/data/fonts/liberationsans.ttf b/data/fonts/liberationsans.ttf
index 09329b2bf..e735ae664 100644
Binary files a/data/fonts/liberationsans.ttf and b/data/fonts/liberationsans.ttf differ
diff --git a/data/fonts/liberationsansmono-bold.ttf b/data/fonts/liberationsansmono-bold.ttf
index 35c42bb6b..e7fbbe636 100644
Binary files a/data/fonts/liberationsansmono-bold.ttf and b/data/fonts/liberationsansmono-bold.ttf differ
diff --git a/data/fonts/liberationsansmono.ttf b/data/fonts/liberationsansmono.ttf
index cf17ca6eb..20b0593bb 100644
Binary files a/data/fonts/liberationsansmono.ttf and b/data/fonts/liberationsansmono.ttf differ
diff --git a/data/fonts/mplus-1p-bold.ttf b/data/fonts/mplus-1p-bold.ttf
index f26632e87..377d04987 100644
Binary files a/data/fonts/mplus-1p-bold.ttf and b/data/fonts/mplus-1p-bold.ttf differ
diff --git a/data/fonts/mplus-1p-regular.ttf b/data/fonts/mplus-1p-regular.ttf
index 31a56b30b..d809f4f8f 100644
Binary files a/data/fonts/mplus-1p-regular.ttf and b/data/fonts/mplus-1p-regular.ttf differ
-- 
cgit v1.2.3-70-g09d2


From 2e84ac20fcf6ec69b40e19c4c6c428db04b70d85 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 17 Feb 2012 02:40:14 +0300
Subject: Add branding option for server list file name.

---
 data/evol/evol.manaplus  | 1 +
 src/defaults.cpp         | 1 +
 src/gui/serverdialog.cpp | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'data')

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"))
-- 
cgit v1.2.3-70-g09d2