summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-07 23:45:49 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-07 23:45:49 +0000
commita1b41fc31ea08bd869e609bb41dd8ba011dcbb66 (patch)
tree1998a7d08771a1e22163727db9b6018186f1b0fb /src/map/pc.c
parent5fd92c094561f989546694d6a80a4adf1609eca2 (diff)
downloadhercules-a1b41fc31ea08bd869e609bb41dd8ba011dcbb66.tar.gz
hercules-a1b41fc31ea08bd869e609bb41dd8ba011dcbb66.tar.bz2
hercules-a1b41fc31ea08bd869e609bb41dd8ba011dcbb66.tar.xz
hercules-a1b41fc31ea08bd869e609bb41dd8ba011dcbb66.zip
Merged database changes from trunk r14927.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14927 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index a9d798ade..5e454415c 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1607,8 +1607,8 @@ static int pc_bonus_item_drop(struct s_add_drop *drop, const short max, short id
}
for(i = 0; i < max && (drop[i].id || drop[i].group); i++) {
if(
- (id && drop[i].id == id) ||
- (group && drop[i].group == group)
+ ((id && drop[i].id == id) ||
+ (group && drop[i].group == group)) && race < (1<<RC_MAX)
) {
drop[i].race |= race;
if(drop[i].rate > 0 && rate > 0)
@@ -2853,6 +2853,10 @@ int pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val)
if(sd->state.lr_flag != 2)
pc_bonus_item_drop(sd->add_drop, ARRAYLENGTH(sd->add_drop), type2, 0, 1<<type3, val);
break;
+ case SP_ADD_CLASS_DROP_ITEM:
+ if(sd->state.lr_flag != 2)
+ pc_bonus_item_drop(sd->add_drop, ARRAYLENGTH(sd->add_drop), type2, 0, type3, val);
+ break;
case SP_AUTOSPELL:
if(sd->state.lr_flag != 2)
{