From 5278174e72f1fe0b35dbe28e3295ee34f76bc821 Mon Sep 17 00:00:00 2001 From: eathenabot Date: Sat, 31 Mar 2012 22:30:30 +0000 Subject: * Merged changes up to eAthena 15084. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15818 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/intif.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/map/intif.c') diff --git a/src/map/intif.c b/src/map/intif.c index 61a60c91e..78f3d585c 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -13,6 +13,7 @@ #include "clif.h" #include "pc.h" #include "intif.h" +#include "log.h" #include "storage.h" #include "party.h" #include "guild.h" @@ -1774,9 +1775,13 @@ static void intif_parse_Auction_register(int fd) } else { + int zeny = auction.hours*battle_config.auction_feeperhour; + clif_Auction_message(sd->fd, 4); pc_additem(sd, &auction.item, auction.item.amount, LOG_TYPE_AUCTION); - pc_getzeny(sd, auction.hours * battle_config.auction_feeperhour); + + log_zeny(sd, LOG_TYPE_AUCTION, sd, zeny); + pc_getzeny(sd, zeny); } } @@ -1836,6 +1841,7 @@ static void intif_parse_Auction_close(int fd) clif_Auction_close(sd->fd, result); if( result == 0 ) { + // FIXME: Leeching off a parse function clif_parse_Auction_cancelreg(fd, sd); intif_Auction_requestlist(sd->status.char_id, 6, 0, "", 1); } @@ -1871,7 +1877,10 @@ static void intif_parse_Auction_bid(int fd) clif_Auction_message(sd->fd, result); if( bid > 0 ) + { + log_zeny(sd, LOG_TYPE_AUCTION, sd, bid); pc_getzeny(sd, bid); + } if( result == 1 ) { // To update the list, display your buy list clif_parse_Auction_cancelreg(fd, sd); -- cgit v1.2.3-70-g09d2