diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
commit | 4c91abd6a020ee030114ae3f22d8f6066e7528be (patch) | |
tree | 9f76256eabe4900a7eef6cbb94b7ed2378b93f48 /src/map/itemdb.cpp | |
parent | 0a202555d2e12866b3619af92f50cb38ea4adb12 (diff) | |
parent | 711680d652a8db17c1b91428b6d6835f30dfb4fd (diff) | |
download | tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.gz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.bz2 tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.xz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.zip |
Merge remote-tracking branch 'origin/hotfix'
Conflicts:
src/map/chrif.cpp
Diffstat (limited to 'src/map/itemdb.cpp')
-rw-r--r-- | src/map/itemdb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index 2f7ed30..dbe2dd6 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -92,7 +92,7 @@ Option<Borrowed<struct item_data>> itemdb_exists(ItemNameId nameid) Borrowed<struct item_data> itemdb_search(ItemNameId nameid) { Option<P<struct item_data>> id_ = item_db.search(nameid); - if OPTION_IS_SOME(id, id_) + if OPTION_IS_SOME_NOLOOP(id, id_) return id; P<struct item_data> id = item_db.init(nameid); |