Move gl_timer to Game struct and change timer_type to class

1 files changed, 3 insertions, 12 deletions

diff --git a/src/util.cc b/src/util.cc
index fc8f4080..7d795828 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -3642,19 +3642,10 @@ char msg_box_auto(std::string const &text)
  */
 timer_type *new_timer(void (*callback)(), s32b delay)
 {
-	timer_type *t_ptr = new timer_type();
-
-	static_assert(std::is_pod<timer_type>::value, "Cannot memset a non-POD type");
-	memset(t_ptr, 0, sizeof(timer_type));
-
-	t_ptr->next = gl_timers;
-	gl_timers = t_ptr;
-
-	t_ptr->callback = callback;
-	t_ptr->delay = delay;
-	t_ptr->countdown = delay;
-	t_ptr->enabled = FALSE;
+	auto &timers = game->timers;
 
+	timer_type *t_ptr = new timer_type(callback, delay);
+	timers.push_back(t_ptr);
 	return t_ptr;
 }