From 8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 11 Jun 2013 21:55:13 -0700 Subject: Allegedly remove all manual memory management --- src/map/npc.hpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/map/npc.hpp') diff --git a/src/map/npc.hpp b/src/map/npc.hpp index 5760ca1..539152f 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -18,7 +18,7 @@ int npc_event_dequeue(dumb_ptr sd); int npc_event(dumb_ptr sd, const char *npcname, int); int npc_timer_event(const char *eventname); // Added by RoVeRT int npc_command(dumb_ptr sd, const char *npcname, const char *command); -int npc_touch_areanpc(dumb_ptr, int, int, int); +int npc_touch_areanpc(dumb_ptr, map_local *, int, int); int npc_click(dumb_ptr, int); int npc_scriptcont(dumb_ptr, int); int npc_buysellsel(dumb_ptr, int, int); @@ -36,7 +36,8 @@ int npc_get_new_npc_id(void); * * \param message The message to speak. If message is NULL, the NPC will not do anything at all. */ -dumb_ptr npc_spawn_text(int m, int x, int y, int class_, const char *name, const char *message); // message is strdup'd within +dumb_ptr npc_spawn_text(map_local *m, int x, int y, + int class_, const char *name, const char *message); // message is strdup'd within /** * Uninstalls and frees an NPC @@ -64,10 +65,10 @@ int npc_event_do(const char *name) return npc_event_do_l(name, 0, 0, NULL); } -int npc_timerevent_start(dumb_ptr nd); -int npc_timerevent_stop(dumb_ptr nd); +void npc_timerevent_start(dumb_ptr nd); +void npc_timerevent_stop(dumb_ptr nd); interval_t npc_gettimerevent_tick(dumb_ptr nd); -int npc_settimerevent_tick(dumb_ptr nd, interval_t newtimer); +void npc_settimerevent_tick(dumb_ptr nd, interval_t newtimer); int npc_delete(dumb_ptr nd); #endif // NPC_HPP -- cgit v1.2.3-70-g09d2