summaryrefslogtreecommitdiff
path: root/src/map/npc.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-02-09 01:51:36 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-02-12 20:21:34 -0800
commit80e36aa669274637bcd5956fbf4020dba1d4739c (patch)
tree2f5d3a63a5f7230ab73cd588e3493c0664a5a73b /src/map/npc.hpp
parent83b2e0b3ceda907b7186acfcc56c214fc04d9c13 (diff)
downloadtmwa-80e36aa669274637bcd5956fbf4020dba1d4739c.tar.gz
tmwa-80e36aa669274637bcd5956fbf4020dba1d4739c.tar.bz2
tmwa-80e36aa669274637bcd5956fbf4020dba1d4739c.tar.xz
tmwa-80e36aa669274637bcd5956fbf4020dba1d4739c.zip
Strictify timers
Diffstat (limited to 'src/map/npc.hpp')
-rw-r--r--src/map/npc.hpp7
1 files changed, 4 insertions, 3 deletions
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 <cstddef>
#include <cstdint>
+#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