summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-15 18:56:43 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-15 18:56:43 +0000
commitcb795008201b5ff1e55ba2f63f3aa95cc4cdca47 (patch)
tree50fee71551241a215ca130bbf801e500d8852d33
parente8f0184d92900f69707d0ac78426e7aafecab17d (diff)
downloadhercules-cb795008201b5ff1e55ba2f63f3aa95cc4cdca47.tar.gz
hercules-cb795008201b5ff1e55ba2f63f3aa95cc4cdca47.tar.bz2
hercules-cb795008201b5ff1e55ba2f63f3aa95cc4cdca47.tar.xz
hercules-cb795008201b5ff1e55ba2f63f3aa95cc4cdca47.zip
- Fixed Option_Wedding in const.txt (0x1000 won't work, it has to be 4096)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6604 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--db/const.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index af36de724..91225d32e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/15
+ * Fixed Option_Wedding in const.txt (0x1000 won't work, it has to be 4096)
+ [Skotlex]
* Fixed the nocast flag 2 (not usable in pvp) returning true in pk-mode
servers. [Skotlex]
* When removing a castle's owning guild, the char servers will erase the
diff --git a/db/const.txt b/db/const.txt
index 3b1e5bf2d..afdbbf1ce 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -78,7 +78,7 @@ Job_Star_Gladiator 4047
Job_Star_Gladiator2 4048
Job_Soul_Linker 4049
-Option_Wedding 0x1000
+Option_Wedding 4096
bc_all 0
bc_map 1