diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-18 14:14:33 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-18 14:14:33 +0000 |
commit | 80342514a6d3370029d6017428afdacce220fc17 (patch) | |
tree | cedd055deb2867d4958a27bfba80a2ddea50bddb /src/map/trade.c | |
parent | 8192b22f355b8e0bce5a49bf0ddaeaf754f1682d (diff) | |
download | hercules-80342514a6d3370029d6017428afdacce220fc17.tar.gz hercules-80342514a6d3370029d6017428afdacce220fc17.tar.bz2 hercules-80342514a6d3370029d6017428afdacce220fc17.tar.xz hercules-80342514a6d3370029d6017428afdacce220fc17.zip |
- Fixed overflow on the mob delay adjustment setting.
- Fixed characters being unable to trade again if you attempt a trade on someone who is on storage/npc when you accept the trade.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9669 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/trade.c')
-rw-r--r-- | src/map/trade.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/trade.c b/src/map/trade.c index 63df19940..216692752 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -132,6 +132,10 @@ void trade_tradeack(struct map_session_data *sd, int type) { if (sd->npc_id || sd->vender_id || sd->state.storage_flag || tsd->npc_id || tsd->vender_id || tsd->state.storage_flag) { //Fail + sd->state.deal_locked = 0; + sd->trade_partner = 0; + tsd->state.deal_locked = 0; + tsd->trade_partner = 0; clif_tradestart(sd, 2); clif_tradestart(tsd, 2); return; |