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/magic-v2.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/magic-v2.cpp')
| -rw-r--r-- | src/map/magic-v2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/magic-v2.cpp b/src/map/magic-v2.cpp index 8a84a2d..eeeb989 100644 --- a/src/map/magic-v2.cpp +++ b/src/map/magic-v2.cpp @@ -578,9 +578,9 @@ namespace magic_v2 { count = 1; - item_data *item = itemdb_searchname(s._str); - if (!item) - return fail(s, "no such item"_s); + Borrowed<item_data> item = TRY_UNWRAP(itemdb_searchname(s._str), + return fail(s, "no such item"_s) + ); id = item->nameid; return true; } @@ -594,9 +594,9 @@ namespace magic_v2 if (s._list[1]._type != sexpr::STRING) return fail(s._list[1], "item pair second not name"_s); - item_data *item = itemdb_searchname(s._list[1]._str); - if (!item) - return fail(s, "no such item"_s); + Borrowed<item_data> item = TRY_UNWRAP(itemdb_searchname(s._list[1]._str), + return fail(s, "no such item"_s) + ); id = item->nameid; return true; } |