summaryrefslogtreecommitdiff
path: root/src/map/skill.h
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-09-10 16:12:07 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-09-10 16:12:07 -0700
commitf841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (patch)
treed9b013ab252968ec1e90e721f7b2ab819af0acb0 /src/map/skill.h
parent5939e1bec75f2550d3ce109b9cd9a5d22c0626c2 (diff)
parent723fb5d3431b847526c433a13aa74485cfb564a3 (diff)
downloadtmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.gz
tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.bz2
tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.xz
tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.zip
Merge commit '723fb5d3431b847526c433a13aa74485cfb564a3'
Diffstat (limited to 'src/map/skill.h')
-rw-r--r--src/map/skill.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/skill.h b/src/map/skill.h
index 08f2e18..d0a698c 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -2,6 +2,8 @@
#ifndef _SKILL_H_
#define _SKILL_H_
+#include "../common/timer.h"
+
#include "map.h"
#include "magic.h"
@@ -149,7 +151,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2,
int skill_status_change_start (struct block_list *bl, int type, int val1,
int val2, int val3, int val4, int tick,
int flag);
-int skill_status_change_timer (int tid, unsigned int tick, int id, int data);
+void skill_status_change_timer (timer_id, tick_t, custom_id_t, custom_data_t);
int skill_status_change_active (struct block_list *bl, int type); // [fate]
int skill_encchant_eremental_end (struct block_list *bl, int type);
int skill_status_change_end (struct block_list *bl, int type, int tid);