diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-26 10:27:47 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-26 15:04:16 -0700 |
| commit | 34807ca9fccc7425573256645024722571ef4442 (patch) | |
| tree | 5e716b7fa2d786b15da403072bb6f41f3dfbcc65 /src/map/npc.cpp | |
| parent | b353ae37eb6d374aec4127f1849a5dce81f812b5 (diff) | |
| download | tmwa-34807ca9fccc7425573256645024722571ef4442.tar.gz tmwa-34807ca9fccc7425573256645024722571ef4442.tar.bz2 tmwa-34807ca9fccc7425573256645024722571ef4442.tar.xz tmwa-34807ca9fccc7425573256645024722571ef4442.zip | |
specialize inventory/storage indices
Diffstat (limited to 'src/map/npc.cpp')
| -rw-r--r-- | src/map/npc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp index 3232e4d..7d2b8da 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -890,11 +890,11 @@ int npc_selllist(dumb_ptr<map_session_data> sd, return 1; for (i = 0, z = 0; i < item_list.size(); i++) { - if (item_list[i].ioff2 - 2 < 0 || item_list[i].ioff2 - 2 >= MAX_INVENTORY) + if (!item_list[i].ioff2.ok()) return 1; - ItemNameId nameid = sd->status.inventory[item_list[i].ioff2 - 2].nameid; + ItemNameId nameid = sd->status.inventory[item_list[i].ioff2.unshift()].nameid; if (!nameid || - sd->status.inventory[item_list[i].ioff2 - 2].amount < item_list[i].count) + sd->status.inventory[item_list[i].ioff2.unshift()].amount < item_list[i].count) return 1; if (sd->trade_partner) return 2; // cant sell while trading @@ -907,7 +907,7 @@ int npc_selllist(dumb_ptr<map_session_data> sd, pc_getzeny(sd, static_cast<int>(z)); for (i = 0; i < item_list.size(); i++) { - int item_id = item_list[i].ioff2 - 2; + IOff0 item_id = item_list[i].ioff2.unshift(); pc_delitem(sd, item_id, item_list[i].count, 0); } |