summaryrefslogtreecommitdiff
path: root/src/map/itemdb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/itemdb.cpp')
-rw-r--r--src/map/itemdb.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp
index fa675d2..fcde178 100644
--- a/src/map/itemdb.cpp
+++ b/src/map/itemdb.cpp
@@ -116,14 +116,9 @@ Borrowed<struct item_data> itemdb_search(ItemNameId nameid)
*
*------------------------------------------
*/
-int itemdb_isequip(ItemNameId nameid)
+bool itemdb_isequip(ItemNameId nameid)
{
- ItemType type = itemdb_type(nameid);
- return !(type == ItemType::USE
- || type == ItemType::_2
- || type == ItemType::JUNK
- || type == ItemType::_6
- || type == ItemType::ARROW);
+ return itemdb_isequip2(itemdb_search(nameid));
}
/*==========================================
@@ -140,18 +135,6 @@ bool itemdb_isequip2(Borrowed<struct item_data> data)
|| type == ItemType::ARROW);
}
-/*==========================================
- *
- *------------------------------------------
- */
-int itemdb_isequip3(ItemNameId nameid)
-{
- ItemType type = itemdb_type(nameid);
- return (type == ItemType::WEAPON
- || type == ItemType::ARMOR
- || type == ItemType::_8);
-}
-
bool itemdb_readdb(ZString filename)
{
io::LineCharReader in(filename);