summaryrefslogtreecommitdiff
path: root/src/map/intif.c
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-31 22:30:30 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-31 22:30:30 +0000
commit5278174e72f1fe0b35dbe28e3295ee34f76bc821 (patch)
treef0037bed78ce11812b61e3b0dc16b814147371bb /src/map/intif.c
parente32bcfd3af4b93b46d09cbe1080197b790a126bf (diff)
downloadhercules-5278174e72f1fe0b35dbe28e3295ee34f76bc821.tar.gz
hercules-5278174e72f1fe0b35dbe28e3295ee34f76bc821.tar.bz2
hercules-5278174e72f1fe0b35dbe28e3295ee34f76bc821.tar.xz
hercules-5278174e72f1fe0b35dbe28e3295ee34f76bc821.zip
* Merged changes up to eAthena 15084.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15818 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/intif.c')
-rw-r--r--src/map/intif.c11
1 files changed, 10 insertions, 1 deletions
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);