Lua: Move Theme's "aggravate_evil" timer to C

3 files changed, 1 insertions, 54 deletions

diff --git a/lib/core/util.lua b/lib/core/util.lua
index 048b0d0f..7729ac35 100644
--- a/lib/core/util.lua
+++ b/lib/core/util.lua
@@ -71,28 +71,6 @@ function msg_print(c, m)
 	end
 end
 
--- better timer add function
-__timers_callback_max = 0
-
-function new_timer(t)
-	assert(t.delay > 0, "no timer delay")
-	assert(t.enabled, "no timer enabled state")
-	assert(t.callback, "no timer callback")
-
-	local timer
-	if type(t.callback) == "function" then
-		setglobal("__timers_callback_"..__timers_callback_max, t.callback)
-		timer = %new_timer("__timers_callback_"..__timers_callback_max, t.delay)
-		__timers_callback_max = __timers_callback_max + 1
-	else
-		timer = %new_timer(t.callback, t.delay)
-	end
-
-	timer.enabled = t.enabled
-
-	return timer
-end
-
 
 -- displays a scrolling list
 function display_list(y, x, h, w, title, list, begin, sel, sel_color)
diff --git a/lib/mods/theme/core/util.lua b/lib/mods/theme/core/util.lua
index 048b0d0f..7729ac35 100644
--- a/lib/mods/theme/core/util.lua
+++ b/lib/mods/theme/core/util.lua
@@ -71,28 +71,6 @@ function msg_print(c, m)
 	end
 end
 
--- better timer add function
-__timers_callback_max = 0
-
-function new_timer(t)
-	assert(t.delay > 0, "no timer delay")
-	assert(t.enabled, "no timer enabled state")
-	assert(t.callback, "no timer callback")
-
-	local timer
-	if type(t.callback) == "function" then
-		setglobal("__timers_callback_"..__timers_callback_max, t.callback)
-		timer = %new_timer("__timers_callback_"..__timers_callback_max, t.delay)
-		__timers_callback_max = __timers_callback_max + 1
-	else
-		timer = %new_timer(t.callback, t.delay)
-	end
-
-	timer.enabled = t.enabled
-
-	return timer
-end
-
 
 -- displays a scrolling list
 function display_list(y, x, h, w, title, list, begin, sel, sel_color)
diff --git a/lib/mods/theme/scpt/monsters.lua b/lib/mods/theme/scpt/monsters.lua
index cbadf1d6..6c0cc197 100644
--- a/lib/mods/theme/scpt/monsters.lua
+++ b/lib/mods/theme/scpt/monsters.lua
@@ -62,15 +62,6 @@ end
 
 -- cast dispel evil with 0 damage every 10 turns 
 
-TIMER_AGGRAVATE_EVIL = new_timer 
-{ 
-   ["enabled"] = FALSE, 
-   ["delay"] = 10, 
-   ["callback"] = function() 
-      dispel_evil(0) 
-   end, 
-} 
-
 add_hooks{ 
 [HOOK_GAME_START] = function() 
 
@@ -80,7 +71,7 @@ add_hooks{
 	(player_has_corruption(CORRUPT_BALROG_STRENGTH) ~= TRUE) and
 	(player_has_corruption(CORRUPT_BALROG_FORM) ~= TRUE)) then
 	-- "Proper" Maiar aggravate evil beings
-    	TIMER_AGGRAVATE_EVIL.enabled = TRUE
+        timer_aggravate_evil_enable()
 	-- Good beings (except swans, GWoPs, Wyrm Spirits, and some joke uniques) are coaligned with Maiar 
 
 	monst_al_add(MSTATUS_FRIEND, {25, 29, 45, 97, 109, 147, 225, 335, 346, 443, 581, 629, 699, 853, 984, 1007, 1017}, {21})