diff options
Diffstat (limited to 'src/map/itemdb.hpp')
| -rw-r--r-- | src/map/itemdb.hpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index 25b4dad..5e19c0b 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -23,14 +23,16 @@ #include "fwd.hpp" #include "../mmo/ids.hpp" -#include "../mmo/mmo.hpp" +#include "../high/mmo.hpp" #include "map.t.hpp" -#include "script.hpp" +#include "script-buffer.hpp" namespace tmwa { +namespace map +{ struct item_data { ItemNameId nameid; @@ -59,11 +61,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,11 +99,12 @@ 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); void do_final_itemdb(void); bool itemdb_readdb(ZString filename); +} // namespace map } // namespace tmwa |