1 files changed, 6 insertions, 21 deletions
diff --git a/src/map/npc.hpp b/src/map/npc.hpp
index 33dd378..b587f5f 100644
--- a/src/map/npc.hpp
+++ b/src/map/npc.hpp
@@ -24,38 +24,33 @@
 
 #include <cstdint>
 
-#include "../strings/fwd.hpp"
-
-#include "../generic/fwd.hpp"
+#include "../range/slice.hpp"
 
 #include "../net/timer.t.hpp"
 
-#include "../proto2/fwd.hpp"
-
 #include "map.hpp"
+#include "script-call.t.hpp"
 
 
 namespace tmwa
 {
+namespace map
+{
 constexpr BlockId START_NPC_NUM = wrap<BlockId>(110000000);
 
 // TODO make these species, see npc_class in npc_data
 constexpr Species WARP_CLASS = wrap<Species>(45);
 constexpr Species FAKE_NPC_CLASS = wrap<Species>(127);
-constexpr Species WARP_DEBUG_CLASS = wrap<Species>(722);
 constexpr Species INVISIBLE_CLASS = wrap<Species>(32767);
 
 int npc_event_dequeue(dumb_ptr<map_session_data> sd);
 int npc_event(dumb_ptr<map_session_data> sd, NpcEvent npcname, int);
-void npc_timer_event(NpcEvent eventname);   // Added by RoVeRT
-int npc_command(dumb_ptr<map_session_data> sd, NpcName npcname, XString command);
-int npc_touch_areanpc(dumb_ptr<map_session_data>, map_local *, int, int);
+int npc_touch_areanpc(dumb_ptr<map_session_data>, Borrowed<map_local>, int, int);
 int npc_click(dumb_ptr<map_session_data>, BlockId);
 int npc_scriptcont(dumb_ptr<map_session_data>, BlockId);
 int npc_buysellsel(dumb_ptr<map_session_data>, BlockId, int);
 int npc_buylist(dumb_ptr<map_session_data>, const std::vector<Packet_Repeat<0x00c8>>&);
 int npc_selllist(dumb_ptr<map_session_data>, const std::vector<Packet_Repeat<0x00c9>>&);
-int npc_parse_warp(XString w1, XString, NpcName w3, XString w4);
 
 int npc_enable(NpcName name, bool flag);
 dumb_ptr<npc_data> npc_name2id(NpcName name);
@@ -63,21 +58,10 @@ dumb_ptr<npc_data> npc_name2id(NpcName name);
 BlockId npc_get_new_npc_id(void);
 
 /**
- * Spawns and installs a talk-only NPC
- *
- * \param message The message to speak.  If message is nullptr, the NPC will not do anything at all.
- */
-dumb_ptr<npc_data> npc_spawn_text(map_local *m, int x, int y,
-        Species class_, NpcName name, AString message);
-
-/**
  * Uninstalls and frees an NPC
  */
 void npc_free(dumb_ptr<npc_data> npc);
 
-void npc_addsrcfile(AString);
-void npc_delsrcfile(XString);
-bool do_init_npc(void);
 int npc_event_do_oninit(void);
 
 int npc_event_doall_l(ScriptLabel name, BlockId rid, Slice<argrec_t> argv);
@@ -98,4 +82,5 @@ void npc_timerevent_stop(dumb_ptr<npc_data_script> nd);
 interval_t npc_gettimerevent_tick(dumb_ptr<npc_data_script> nd);
 void npc_settimerevent_tick(dumb_ptr<npc_data_script> nd, interval_t newtimer);
 int npc_delete(dumb_ptr<npc_data> nd);
+} // namespace map
 } // namespace tmwa