diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-24 14:13:39 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-24 14:13:39 +0000 |
| commit | 373cfe9bee3f297540d09cb0616e2b5da17463f3 (patch) | |
| tree | 7c525ce072d2ac917fe63ff0ad5805d28acbfd3c /src/map/mob.c | |
| parent | 4b787eb878c4410512ceffb9f92b6f3cd7975bce (diff) | |
| download | hercules-373cfe9bee3f297540d09cb0616e2b5da17463f3.tar.gz hercules-373cfe9bee3f297540d09cb0616e2b5da17463f3.tar.bz2 hercules-373cfe9bee3f297540d09cb0616e2b5da17463f3.tar.xz hercules-373cfe9bee3f297540d09cb0616e2b5da17463f3.zip | |
* Merged changes up to eAthena 15040.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15245 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 740f67226..fd5d592c1 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1470,8 +1470,8 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick) return true; //Busy attacking? fitem = (struct flooritem_data *)tbl; - if(log_config.enable_logs & LOG_MONSTER_ITEMS) //Logs items, taken by (L)ooter Mobs [Lupus] - log_pick_mob(md, "L", fitem->item_data.nameid, fitem->item_data.amount, &fitem->item_data); + //Logs items, taken by (L)ooter Mobs [Lupus] + log_pick_mob(md, LOG_TYPE_LOOT, fitem->item_data.nameid, fitem->item_data.amount, &fitem->item_data); if (md->lootitem_count < LOOTITEM_SIZE) { memcpy (&md->lootitem[md->lootitem_count++], &fitem->item_data, sizeof(md->lootitem[0])); @@ -1711,13 +1711,11 @@ static void mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, str { TBL_PC* sd; - if(log_config.enable_logs & LOG_MONSTER_ITEMS) - { //Logs items, dropped by mobs [Lupus] - if (loot) - log_pick_mob(md, "L", ditem->item_data.nameid, -ditem->item_data.amount, &ditem->item_data); - else - log_pick_mob(md, "M", ditem->item_data.nameid, -ditem->item_data.amount, NULL); - } + //Logs items, dropped by mobs [Lupus] + if (loot) + log_pick_mob(md, LOG_TYPE_LOOT, ditem->item_data.nameid, -ditem->item_data.amount, &ditem->item_data); + else + log_pick_mob(md, LOG_TYPE_PICKDROP_MONSTER, ditem->item_data.nameid, -ditem->item_data.amount, NULL); sd = map_charid2sd(dlist->first_charid); if( sd == NULL ) sd = map_charid2sd(dlist->second_charid); @@ -2389,16 +2387,14 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) map_addflooritem(&item,1,mvp_sd->bl.m,mvp_sd->bl.x,mvp_sd->bl.y,mvp_sd->status.char_id,(second_sd?second_sd->status.char_id:0),(third_sd?third_sd->status.char_id:0),1); } - if(log_config.enable_logs & LOG_MVP_PRIZE) {//Logs items, MVP prizes [Lupus] - log_pick_mob(md, "M", item.nameid, -1, NULL); - if (!temp) - log_pick_pc(mvp_sd, "P", item.nameid, 1, NULL); - } + //Logs items, MVP prizes [Lupus] + log_pick_mob(md, LOG_TYPE_PICKDROP_MONSTER, item.nameid, -1, NULL); + if (!temp) + log_pick_pc(mvp_sd, LOG_TYPE_PICKDROP_PLAYER, item.nameid, 1, NULL); break; } - if(log_config.mvpdrop > 0) - log_mvpdrop(mvp_sd, md->class_, log_mvp); + log_mvpdrop(mvp_sd, md->class_, log_mvp); } if (type&2 && !sd && md->class_ == MOBID_EMPERIUM) |