diff options
author | Jedzkie <jedzkie13@rocketmail.com> | 2017-04-25 16:44:27 +0800 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2017-04-29 00:47:06 +0200 |
commit | 25e4f661211fc91a64a6e18d8ffd9d16581dfaf9 (patch) | |
tree | 69a41c87390593f0ca4e592a83037cf5b35ffcf8 /src/map/mob.c | |
parent | e6c0203a6da6930d9c4a2b762190cd0428e106ca (diff) | |
download | hercules-25e4f661211fc91a64a6e18d8ffd9d16581dfaf9.tar.gz hercules-25e4f661211fc91a64a6e18d8ffd9d16581dfaf9.tar.bz2 hercules-25e4f661211fc91a64a6e18d8ffd9d16581dfaf9.tar.xz hercules-25e4f661211fc91a64a6e18d8ffd9d16581dfaf9.zip |
Fixes #994
Diffstat (limited to 'src/map/mob.c')
-rw-r--r-- | src/map/mob.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 74d25b805..4f08cf38e 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2151,6 +2151,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) { struct map_session_data *sd = BL_CAST(BL_PC, src); struct map_session_data *tmpsd[DAMAGELOG_SIZE] = { NULL }; struct map_session_data *mvp_sd = sd, *second_sd = NULL, *third_sd = NULL; + struct item_data *id = NULL; struct { struct party_data *p; @@ -2447,14 +2448,12 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) { intif->broadcast(message, (int)strlen(message)+1, BC_DEFAULT); } - /* heres the thing we got the feature set up however we're still discussing how to best define the ids, - * so while we discuss, for a small period of time, the list is hardcoded (yes officially only those 2 use it, - * thus why we're unsure on how to best place the setting) */ - /* temp, will not be hardcoded for long thudu. */ - // TODO: This should be a field in the item db. - if (mvp_sd != NULL - && (it->nameid == ITEMID_GOLD_KEY77 || it->nameid == ITEMID_SILVER_KEY77)) /* for when not hardcoded: add a check on mvp bonus drop as well */ - clif->item_drop_announce(mvp_sd, it->nameid, md->name); + // Official Drop Announce [Jedzkie] + if (mvp_sd != NULL) { + if ((id = itemdb->search(it->nameid)) != NULL && id->flag.drop_announce) { + clif->item_drop_announce(mvp_sd, it->nameid, md->name); + } + } // Announce first, or else ditem will be freed. [Lance] // By popular demand, use base drop rate for autoloot code. [Skotlex] |