diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-18 22:09:42 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-18 22:23:16 -0700 |
| commit | 7f16d356995d4e9c29105f98d502a7e51a4c775d (patch) | |
| tree | 3fc9f782d67f68d44c36d0dff2c197fc33dac206 /src/map/trade.cpp | |
| parent | 56e149a51562b9d2620bc9037a81735c29ea95af (diff) | |
| parent | 6d631217271fcdc57143a7f8e03a2595a93ab50f (diff) | |
| download | tmwa-7f16d356995d4e9c29105f98d502a7e51a4c775d.tar.gz tmwa-7f16d356995d4e9c29105f98d502a7e51a4c775d.tar.bz2 tmwa-7f16d356995d4e9c29105f98d502a7e51a4c775d.tar.xz tmwa-7f16d356995d4e9c29105f98d502a7e51a4c775d.zip | |
Merge tag 'v14.4.18' into master
Conflicts:
src/admin/ladmin.cpp
src/char/char.cpp
src/login/login.cpp
src/map/chrif.cpp
src/map/clif.cpp
src/mmo/socket.cpp
Diffstat (limited to 'src/map/trade.cpp')
| -rw-r--r-- | src/map/trade.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/trade.cpp b/src/map/trade.cpp index 7fbfbec..86d876f 100644 --- a/src/map/trade.cpp +++ b/src/map/trade.cpp @@ -260,8 +260,11 @@ void trade_tradeok(dumb_ptr<map_session_data> sd) for (trade_i = 0; trade_i < TRADE_MAX; trade_i++) { + int index = sd->deal_item_index[trade_i]; + if (index < 2 || index >= MAX_INVENTORY + 2) + continue; if (sd->deal_item_amount[trade_i] > - sd->status.inventory[sd->deal_item_index[trade_i] - 2].amount + sd->status.inventory[index - 2].amount || sd->deal_item_amount[trade_i] < 0) { trade_tradecancel(sd); |