From 780a0d771edbe21dcfa3405163ffbdf7f7fa4604 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 13 Oct 2014 13:16:34 -0700
Subject: Convert container lookups to use Option<Borrowed<T>>

---
 src/map/itemdb.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/map/itemdb.hpp')

diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp
index 1fdca2e..fccfa23 100644
--- a/src/map/itemdb.hpp
+++ b/src/map/itemdb.hpp
@@ -59,11 +59,11 @@ struct random_item_data
 };
 
 inline
-struct item_data *itemdb_searchname(ItemName) = delete;
-struct item_data *itemdb_searchname(XString name);
+Option<Borrowed<struct item_data>> itemdb_searchname(ItemName) = delete;
+Option<Borrowed<struct item_data>> itemdb_searchname(XString name);
 // TODO this function should die
-struct item_data *itemdb_search(ItemNameId nameid);
-struct item_data *itemdb_exists(ItemNameId nameid);
+Borrowed<struct item_data> itemdb_search(ItemNameId nameid);
+Option<Borrowed<struct item_data>> itemdb_exists(ItemNameId nameid);
 
 inline
 ItemType itemdb_type(ItemNameId n)
@@ -97,7 +97,7 @@ int itemdb_value_sell(ItemNameId n)
 }
 
 int itemdb_isequip(ItemNameId);
-int itemdb_isequip2(struct item_data *);
+bool itemdb_isequip2(Borrowed<struct item_data>);
 int itemdb_isequip3(ItemNameId);
 
 void itemdb_reload(void);
-- 
cgit v1.2.3-70-g09d2