diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-13 13:16:34 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-13 14:03:46 -0700 |
| commit | 780a0d771edbe21dcfa3405163ffbdf7f7fa4604 (patch) | |
| tree | ac202254d015d2a2a28ab5bca60c3f5474d168ba /src/map/chrif.cpp | |
| parent | a5e0fe8204a8b3299507a645f3479e9ead6c6110 (diff) | |
| download | tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.gz tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.bz2 tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.xz tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.zip | |
Convert container lookups to use Option<Borrowed<T>>
Diffstat (limited to 'src/map/chrif.cpp')
| -rw-r--r-- | src/map/chrif.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp index 0ebdf1c..090cccf 100644 --- a/src/map/chrif.cpp +++ b/src/map/chrif.cpp @@ -960,7 +960,6 @@ void ladmin_itemfrob_c2(dumb_ptr<block_list> bl, ItemNameId source_id, ItemNameI case BL::PC: { dumb_ptr<map_session_data> pc = bl->is_player(); - Storage *stor = account2storage2(pc->status_key.account_id); for (IOff0 j : IOff0::iter()) IFIX(pc->status.inventory[j].nameid); @@ -971,7 +970,8 @@ void ladmin_itemfrob_c2(dumb_ptr<block_list> bl, ItemNameId source_id, ItemNameI IFIX(pc->status.head_mid); IFIX(pc->status.head_bottom); - if (stor) + Option<P<Storage>> stor_ = account2storage2(pc->status_key.account_id); + if OPTION_IS_SOME(stor, stor_) { for (SOff0 j : SOff0::iter()) FIX(stor->storage_[j]); @@ -979,8 +979,8 @@ void ladmin_itemfrob_c2(dumb_ptr<block_list> bl, ItemNameId source_id, ItemNameI for (IOff0 j : IOff0::iter()) { - struct item_data *item = pc->inventory_data[j]; - if (item && item->nameid == source_id) + P<struct item_data> item = TRY_UNWRAP(pc->inventory_data[j], continue); + if (item->nameid == source_id) { item->nameid = dest_id; if (bool(item->equip)) |