summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/itemdb.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 885c3242b..57ea60cd1 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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/08/19
+ * Fixed job-mask 0x100000 in the item_db enabling Dancers/Bards to use the
+ items (0x80000 should be for them and 0x100000 should be currently unused)
+ [Skotlex]
* Fixed a possible sigsegv when deleting lif under Mental Change [Toms]
* Fixed HAMI_CASTLE [Toms]
* Fixed HLIF_CHANGE [Toms]
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index c47aaf90a..f4de37cfa 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -190,8 +190,9 @@ static void itemdb_jobid2mapid(unsigned int *bclass, unsigned int jobmask)
bclass[2] |= 1<<MAPID_MERCHANT;
if (jobmask & 1<<JOB_BARD)
bclass[2] |= 1<<MAPID_ARCHER;
- if (jobmask & 1<<JOB_DANCER)
- bclass[2] |= 1<<MAPID_ARCHER;
+// Bard/Dancer share the same slot now.
+// if (jobmask & 1<<JOB_DANCER)
+// bclass[2] |= 1<<MAPID_ARCHER;
if (jobmask & 1<<JOB_ROGUE)
bclass[2] |= 1<<MAPID_THIEF;
//Special classes that don't fit above.