summaryrefslogtreecommitdiff
path: root/src/char_sql
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-10 02:44:07 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-10 02:44:07 +0000
commit97af12ef15eb26b1891aca39951e115db1e24f1b (patch)
treea39d7b571dccaf8fe2854a84b0585edfd660b8b7 /src/char_sql
parent636baf0312a210f4f0a9da204756b6d4ff737c04 (diff)
downloadhercules-97af12ef15eb26b1891aca39951e115db1e24f1b.tar.gz
hercules-97af12ef15eb26b1891aca39951e115db1e24f1b.tar.bz2
hercules-97af12ef15eb26b1891aca39951e115db1e24f1b.tar.xz
hercules-97af12ef15eb26b1891aca39951e115db1e24f1b.zip
- Fixed a bug allow GM with notrade to send zeny.
- Added a fix into auction system allow to direct buy or increase your own bid if you reach the 5 bids limit. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12335 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql')
-rw-r--r--src/char_sql/int_auction.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/char_sql/int_auction.c b/src/char_sql/int_auction.c
index ddc9e567f..f1021b983 100644
--- a/src/char_sql/int_auction.c
+++ b/src/char_sql/int_auction.c
@@ -415,7 +415,7 @@ static void mapif_parse_Auction_bid(int fd)
return;
}
- if( auction_count(char_id, true) > 4 )
+ if( auction_count(char_id, true) > 4 && bid < auction->buynow && auction->buyer_id != char_id )
{
mapif_Auction_bid(fd, char_id, bid, 9); // You cannot place more than 5 bids at a time
return;
@@ -434,6 +434,7 @@ static void mapif_parse_Auction_bid(int fd)
auction->buyer_id = char_id;
safestrncpy(auction->buyer_name, (char*)RFIFOP(fd,16), NAME_LENGTH);
+ auction->price = bid;
if( bid >= auction->buynow )
{ // Automatic won the auction
@@ -447,7 +448,6 @@ static void mapif_parse_Auction_bid(int fd)
return;
}
- auction->price = bid;
auction_save(auction);
mapif_Auction_bid(fd, char_id, 0, 1); // You have successfully bid in the auction