diff options
Diffstat (limited to 'src/util.c')
-rw-r--r-- | src/util.c | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -4417,16 +4417,15 @@ void scansubdir(cptr dir) /* * Timers */ -static timer_type *new_timer_init(s32b delay) +timer_type *new_timer(void (*callback)(), s32b delay) { - timer_type *t_ptr; + timer_type *t_ptr = NULL; MAKE(t_ptr, timer_type); t_ptr->next = gl_timers; gl_timers = t_ptr; - t_ptr->callback_c = NULL; - t_ptr->callback = NULL; + t_ptr->callback = callback; t_ptr->delay = delay; t_ptr->countdown = delay; t_ptr->enabled = FALSE; @@ -4434,13 +4433,6 @@ static timer_type *new_timer_init(s32b delay) return t_ptr; } -timer_type *new_timer_c(void (*callback)(), s32b delay) -{ - timer_type *t_ptr = new_timer_init(delay); - t_ptr->callback_c = callback; - return t_ptr; -} - void del_timer(timer_type *t_ptr) { timer_type *i, *old; @@ -4454,7 +4446,7 @@ void del_timer(timer_type *t_ptr) gl_timers = t_ptr->next; else old->next = t_ptr->next; - string_free(t_ptr->callback); + FREE(t_ptr, timer_type); } else |