From 373cfe9bee3f297540d09cb0616e2b5da17463f3 Mon Sep 17 00:00:00 2001 From: eathenabot Date: Sat, 24 Dec 2011 14:13:39 +0000 Subject: * Merged changes up to eAthena 15040. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15245 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 0d4e886ba..0312bb892 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1376,8 +1376,7 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po pc_additem(sd,&item_tmp, amount); } - if(log_config.enable_logs & LOG_NPC_TRANSACTIONS) - log_pick_pc(sd, "S", nameid, amount, NULL); + log_pick_pc(sd, LOG_TYPE_NPC, nameid, amount, NULL); return 0; } @@ -1467,8 +1466,7 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list) return 3; // Not enough space to store items //Logs (S)hopping Zeny [Lupus] - if( log_config.zeny > 0 ) - log_zeny(sd, "S", sd, -(int)z); + log_zeny(sd, LOG_TYPE_NPC, sd, -(int)z); //Logs pc_payzeny(sd,(int)z); @@ -1486,8 +1484,7 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list) pc_additem(sd,&item_tmp,amount); //Logs items, Bought in NPC (S)hop [Lupus] - if( log_config.enable_logs & LOG_NPC_TRANSACTIONS ) - log_pick_pc(sd, "S", item_tmp.nameid, amount, NULL); + log_pick_pc(sd, LOG_TYPE_NPC, item_tmp.nameid, amount, NULL); //Logs } @@ -1630,8 +1627,7 @@ int npc_selllist(struct map_session_data* sd, int n, unsigned short* item_list) nameid = sd->status.inventory[idx].nameid; //Logs items, Sold to NPC (S)hop [Lupus] - if( log_config.enable_logs & LOG_NPC_TRANSACTIONS ) - log_pick_pc(sd, "S", nameid, -amount, &sd->status.inventory[idx]); + log_pick_pc(sd, LOG_TYPE_NPC, nameid, -amount, &sd->status.inventory[idx]); //Logs if( sd->inventory_data[idx]->type == IT_PETEGG && sd->status.inventory[idx].card[0] == CARD0_PET ) @@ -1649,8 +1645,7 @@ int npc_selllist(struct map_session_data* sd, int n, unsigned short* item_list) z = MAX_ZENY; //Logs (S)hopping Zeny [Lupus] - if( log_config.zeny ) - log_zeny(sd, "S", sd, (int)z); + log_zeny(sd, LOG_TYPE_NPC, sd, (int)z); //Logs pc_getzeny(sd, (int)z); -- cgit v1.2.3-60-g2f50