diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-11 21:55:13 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-11 23:27:33 -0700 |
commit | 8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13 (patch) | |
tree | 15e8a4841af992e17794f26fc7991ed40c35bd51 /src/map/npc.hpp | |
parent | 8c6072df499ef9068346fbe8313b63dbba1e4e82 (diff) | |
download | tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.gz tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.bz2 tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.xz tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.zip |
Allegedly remove all manual memory management
Diffstat (limited to 'src/map/npc.hpp')
-rw-r--r-- | src/map/npc.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
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<map_session_data> sd); int npc_event(dumb_ptr<map_session_data> sd, const char *npcname, int); int npc_timer_event(const char *eventname); // Added by RoVeRT int npc_command(dumb_ptr<map_session_data> sd, const char *npcname, const char *command); -int npc_touch_areanpc(dumb_ptr<map_session_data>, int, int, int); +int npc_touch_areanpc(dumb_ptr<map_session_data>, map_local *, int, int); int npc_click(dumb_ptr<map_session_data>, int); int npc_scriptcont(dumb_ptr<map_session_data>, int); int npc_buysellsel(dumb_ptr<map_session_data>, 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_data> 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_data> 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<npc_data_script> nd); -int npc_timerevent_stop(dumb_ptr<npc_data_script> nd); +void npc_timerevent_start(dumb_ptr<npc_data_script> nd); +void npc_timerevent_stop(dumb_ptr<npc_data_script> nd); interval_t npc_gettimerevent_tick(dumb_ptr<npc_data_script> nd); -int npc_settimerevent_tick(dumb_ptr<npc_data_script> nd, interval_t newtimer); +void npc_settimerevent_tick(dumb_ptr<npc_data_script> nd, interval_t newtimer); int npc_delete(dumb_ptr<npc_data> nd); #endif // NPC_HPP |