From 80e36aa669274637bcd5956fbf4020dba1d4739c Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 9 Feb 2013 01:51:36 -0800 Subject: Strictify timers --- src/map/npc.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/map/npc.hpp') diff --git a/src/map/npc.hpp b/src/map/npc.hpp index 50cfaa5..bedca83 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -4,6 +4,8 @@ #include #include +#include "../common/timer.t.hpp" + constexpr int START_NPC_NUM = 110000000; constexpr int WARP_CLASS = 45; @@ -43,7 +45,6 @@ void npc_addsrcfile(const char *); void npc_delsrcfile(const char *); int do_init_npc(void); int npc_event_do_oninit(void); -int npc_do_ontimer(int, struct map_session_data *, int); struct argrec; int npc_event_doall_l(const char *name, int rid, @@ -63,8 +64,8 @@ int npc_event_do(const char *name) int npc_timerevent_start(struct npc_data *nd); int npc_timerevent_stop(struct npc_data *nd); -int npc_gettimerevent_tick(struct npc_data *nd); -int npc_settimerevent_tick(struct npc_data *nd, int newtimer); +interval_t npc_gettimerevent_tick(struct npc_data *nd); +int npc_settimerevent_tick(struct npc_data *nd, interval_t newtimer); int npc_delete(struct npc_data *nd); #endif // NPC_HPP -- cgit v1.2.3-60-g2f50