diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:12:07 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:12:07 -0700 |
| commit | f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (patch) | |
| tree | d9b013ab252968ec1e90e721f7b2ab819af0acb0 /src/map/pc.h | |
| parent | 5939e1bec75f2550d3ce109b9cd9a5d22c0626c2 (diff) | |
| parent | 723fb5d3431b847526c433a13aa74485cfb564a3 (diff) | |
| download | tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.gz tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.bz2 tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.xz tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.zip | |
Merge commit '723fb5d3431b847526c433a13aa74485cfb564a3'
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 20ae26e..742d9d4 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -169,7 +169,7 @@ int pc_addeventtimercount (struct map_session_data *sd, const char *name, int tick); int pc_calc_pvprank (struct map_session_data *sd); -int pc_calc_pvprank_timer (int tid, unsigned int tick, int id, int data); +void pc_calc_pvprank_timer (timer_id, tick_t, custom_id_t, custom_data_t); int pc_ismarried (struct map_session_data *sd); int pc_marriage (struct map_session_data *sd, @@ -202,9 +202,9 @@ enum { ADDITEM_EXIST, ADDITEM_NEW, ADDITEM_OVERAMOUNT }; // timer for night.day -int day_timer_tid; -int night_timer_tid; -int map_day_timer (int, unsigned int, int, int); // by [yor] -int map_night_timer (int, unsigned int, int, int); // by [yor] +timer_id day_timer_tid; +timer_id night_timer_tid; +void map_day_timer (timer_id, tick_t, custom_id_t, custom_data_t); // by [yor] +void map_night_timer (timer_id, tick_t, custom_id_t, custom_data_t); // by [yor] #endif |