diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-11-19 17:44:13 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-11-19 18:19:45 -0800 |
| commit | 711680d652a8db17c1b91428b6d6835f30dfb4fd (patch) | |
| tree | 0d64c8314f8531e2a09c7dc5e242333ddec6582b /src/map/trade.cpp | |
| parent | 078028058d2e9fbcde2147eb4154830e08652066 (diff) | |
| download | tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.gz tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.bz2 tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.xz tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.zip | |
Magically allow "break" within WITH_VAR
Diffstat (limited to 'src/map/trade.cpp')
| -rw-r--r-- | src/map/trade.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/trade.cpp b/src/map/trade.cpp index b5e19be..5ec63c9 100644 --- a/src/map/trade.cpp +++ b/src/map/trade.cpp @@ -174,7 +174,7 @@ void trade_tradeadditem(dumb_ptr<map_session_data> sd, IOff2 index, int amount) sd->status.inventory[index.unshift()].nameid) continue; - if OPTION_IS_SOME(id, target_sd->inventory_data[i]) + if OPTION_IS_SOME_INLOOP(id, target_sd->inventory_data[i]) { if (id->type != ItemType::WEAPON && id->type != ItemType::ARMOR @@ -231,7 +231,7 @@ void trade_tradeadditem(dumb_ptr<map_session_data> sd, IOff2 index, int amount) sd->status. inventory[sd->deal_item_index[trade_i].unshift()].nameid) continue; - if OPTION_IS_SOME(id, target_sd->inventory_data[i]) + if OPTION_IS_SOME_INLOOP(id, target_sd->inventory_data[i]) { if (id->type != ItemType::WEAPON && id->type != ItemType::ARMOR |