From b152e7e73348473517a58f3ad005fbc3d89fc541 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 15 Feb 2009 12:37:03 +0000 Subject: Allow shop parsing to continue after bad item name --- src/map/trade.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/map/trade.c') diff --git a/src/map/trade.c b/src/map/trade.c index 5192a08..5f924e0 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -252,11 +252,15 @@ void trade_tradecommit(struct map_session_data *sd) if( (sd->deal_locked >=1) && (target_sd->deal_locked >=1) ){ // both have pressed 'ok' if(sd->deal_locked < 2) {sd->deal_locked=2;} // set locked to 2 if(target_sd->deal_locked==2) { // the other one pressed 'trade' too - if(sd->deal_zeny) { - if (sd->deal_zeny > sd->status.zeny) trade_tradecancel(sd); + if(sd->deal_zeny > sd->status.zeny) { + sd->deal_zeny = 0; + trade_tradecancel(sd); + return; } - if(target_sd->deal_zeny) { - if (target_sd->deal_zeny > target_sd->status.zeny) trade_tradecancel(sd); + if(target_sd->deal_zeny > target_sd->status.zeny) { + target_sd->deal_zeny = 0; + trade_tradecancel(sd); + return; } for(trade_i=0; trade_i<10;trade_i++) { if(sd->deal_item_amount[trade_i] != 0) { -- cgit v1.2.3-60-g2f50