1 files changed, 22 insertions, 19 deletions
diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp
index 16802da..25b4dad 100644
--- a/src/map/itemdb.hpp
+++ b/src/map/itemdb.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_MAP_ITEMDB_HPP
-#define TMWA_MAP_ITEMDB_HPP
+#pragma once
 //    itemdb.hpp - Item definitions.
 //
 //    Copyright © ????-2004 Athena Dev Teams
@@ -21,16 +20,20 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+#include "fwd.hpp"
 
-# include "../mmo/mmo.hpp"
+#include "../mmo/ids.hpp"
+#include "../mmo/mmo.hpp"
 
-# include "map.t.hpp"
-# include "script.hpp"
+#include "map.t.hpp"
+#include "script.hpp"
 
+
+namespace tmwa
+{
 struct item_data
 {
-    int nameid;
+    ItemNameId nameid;
     ItemName name, jname;
     int value_buy;
     int value_sell;
@@ -58,47 +61,47 @@ struct random_item_data
 inline
 struct item_data *itemdb_searchname(ItemName) = delete;
 struct item_data *itemdb_searchname(XString name);
-struct item_data *itemdb_search(int nameid);
-struct item_data *itemdb_exists(int nameid);
+// TODO this function should die
+struct item_data *itemdb_search(ItemNameId nameid);
+struct item_data *itemdb_exists(ItemNameId nameid);
 
 inline
-ItemType itemdb_type(int n)
+ItemType itemdb_type(ItemNameId n)
 {
     return itemdb_search(n)->type;
 }
 inline
-ItemLook itemdb_look(int n)
+ItemLook itemdb_look(ItemNameId n)
 {
     return itemdb_search(n)->look;
 }
 inline
-int itemdb_weight(int n)
+int itemdb_weight(ItemNameId n)
 {
     return itemdb_search(n)->weight;
 }
 inline
-const ScriptBuffer *itemdb_equipscript(int n)
+const ScriptBuffer *itemdb_equipscript(ItemNameId n)
 {
     return itemdb_search(n)->equip_script.get();
 }
 inline
-int itemdb_wlv(int n)
+int itemdb_wlv(ItemNameId n)
 {
     return itemdb_search(n)->wlv;
 }
 inline
-int itemdb_value_sell(int n)
+int itemdb_value_sell(ItemNameId n)
 {
     return itemdb_search(n)->value_sell;
 }
 
-int itemdb_isequip(int);
+int itemdb_isequip(ItemNameId);
 int itemdb_isequip2(struct item_data *);
-int itemdb_isequip3(int);
+int itemdb_isequip3(ItemNameId);
 
 void itemdb_reload(void);
 
 void do_final_itemdb(void);
 bool itemdb_readdb(ZString filename);
-
-#endif // TMWA_MAP_ITEMDB_HPP
+} // namespace tmwa