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/pc.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/pc.c')
| -rw-r--r-- | src/map/pc.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 0cc3adae6..aea604223 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3512,8 +3512,7 @@ int pc_dropitem(struct map_session_data *sd,int n,int amount) } //Logs items, dropped by (P)layers [Lupus] - if(log_config.enable_logs & LOG_PLAYER_ITEMS) - log_pick_pc(sd, "P", sd->status.inventory[n].nameid, -amount, (struct item*)&sd->status.inventory[n]); + log_pick_pc(sd, LOG_TYPE_PICKDROP_PLAYER, sd->status.inventory[n].nameid, -amount, (struct item*)&sd->status.inventory[n]); //Logs if (!map_addflooritem(&sd->status.inventory[n], amount, sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 2)) @@ -3738,7 +3737,8 @@ int pc_isUseitem(struct map_session_data *sd,int n) } //Dead Branch & Bloody Branch & Porings Box - if((log_config.branch > 0) && (nameid == 604 || nameid == 12103 || nameid == 12109)) + // FIXME: outdated, use constants or database + if( nameid == 604 || nameid == 12103 || nameid == 12109 ) log_branch(sd); return 1; @@ -3824,8 +3824,7 @@ int pc_useitem(struct map_session_data *sd,int n) clif_useitemack(sd,n,amount-1,1); //Logs (C)onsumable items [Lupus] - if( log_config.enable_logs & LOG_USED_ITEMS ) - log_pick_pc(sd, "C", sd->status.inventory[n].nameid, -1, &sd->status.inventory[n]); + log_pick_pc(sd, LOG_TYPE_CONSUME, sd->status.inventory[n].nameid, -1, &sd->status.inventory[n]); pc_delitem(sd,n,1,1,0); // Rental Usable Items are not deleted until expiration } @@ -4086,10 +4085,8 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, int lv) party_foreachsamemap(pc_show_steal,sd,AREA_SIZE,sd,tmp_item.nameid); //Logs items, Stolen from mobs [Lupus] - if(log_config.enable_logs & LOG_STOLEN_ITEMS) { - log_pick_mob(md, "M", itemid, -1, NULL); - log_pick_pc(sd, "P", itemid, 1, NULL); - } + log_pick_mob(md, LOG_TYPE_PICKDROP_MONSTER, itemid, -1, NULL); + log_pick_pc(sd, LOG_TYPE_PICKDROP_PLAYER, itemid, 1, NULL); //A Rare Steal Global Announce by Lupus if(md->db->dropitem[i].p<=battle_config.rare_drop_announce) { |