summaryrefslogtreecommitdiff
path: root/conf/battle
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-15 05:30:25 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-15 05:30:25 +0000
commita7c1a55bb6f3c3236ba02722e948a52c645a4918 (patch)
tree15c41cc68bb37051f7fb94bac03055875e25fe5d /conf/battle
parentec4acd7b1d7f180af5929239ef0706d98d4b6bfc (diff)
downloadhercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.gz
hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.bz2
hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.xz
hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.zip
* Merged changes from trunk [14784:14819/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14821 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf/battle')
-rw-r--r--conf/battle/misc.conf11
1 files changed, 11 insertions, 0 deletions
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index 76d18ed0f..797295aea 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -128,3 +128,14 @@ searchstore_querydelay: 10
// Maximum amount of results a store search query may yield, before
// it is canceled.
searchstore_maxresults: 30
+
+// Whether or not gaining and loosing of cash points is displayed (Note 1).
+// Default: no
+cashshop_show_points: no
+
+// Whether or not mail box status is displayed upon login.
+// Default: 0
+// 0 = No
+// 1 = Yes
+// 2 = Yes, when there are unread mails
+mail_show_status: 0