wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 383:d3e8a11a21ea

Removed AceTimer dependency, replacing all timers with native WoW API functions.

author	MMOSimca <MMOSimca@gmail.com>
date	Thu, 11 Dec 2014 02:42:07 -0500
parents	8d63f8348496
children	ae63dafab1e6

comparison

equal deleted inserted replaced

-:8d63f8348496
+:d3e8a11a21ea
 local next = _G.next
 local select = _G.select
 local unpack = _G.unpack
+local C_Timer = _G.C_Timer
 -- ADDON NAMESPACE ----------------------------------------------------
 local ADDON_NAME, private = ...
 local LibStub = _G.LibStub
-local WDP = LibStub("AceAddon-3.0"):NewAddon(ADDON_NAME, "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0")
+local WDP = LibStub("AceAddon-3.0"):NewAddon(ADDON_NAME, "AceConsole-3.0", "AceEvent-3.0")
 local deformat = LibStub("LibDeformat-3.0")
 local LPJ = LibStub("LibPetJournal-2.0")
 local MapData = LibStub("LibMapData-1.0")
 end
 local function ClearKilledBossID()
 if killed_boss_id_timer_handle then
-WDP:CancelTimer(killed_boss_id_timer_handle)
+killed_boss_id_timer_handle:Cancel()
 killed_boss_id_timer_handle = nil
 end
 table.wipe(boss_loot_toasting)
 private.raid_boss_id = nil
 end
 local function ClearLootToastContainerID()
 if loot_toast_container_timer_handle then
-WDP:CancelTimer(loot_toast_container_timer_handle)
+loot_toast_container_timer_handle:Cancel()
 loot_toast_container_timer_handle = nil
 end
 private.container_loot_toasting = false
 private.loot_toast_container_id = nil
 end
 local function ClearLootToastData()
--- cancel existing timer if found
 if loot_toast_data_timer_handle then
-WDP:CancelTimer(loot_toast_data_timer_handle)
+loot_toast_data_timer_handle:Cancel()
 loot_toast_data_timer_handle = nil
 end
 if loot_toast_data then
 table.wipe(loot_toast_data)
 local function ClearTimeBasedLootData()
 Debug("ClearTimeBasedLootData: Ending salvage loot timer.")
 if chat_loot_timer_handle then
-WDP:CancelTimer(chat_loot_timer_handle)
+chat_loot_timer_handle:Cancel()
 chat_loot_timer_handle = nil
 end
 if current_loot and current_loot.identifier and (current_loot.identifier == BAG_OF_SALVAGE_ITEM_ID or current_loot.identifier == CRATE_OF_SALVAGE_ITEM_ID or current_loot.identifier == BIG_CRATE_OF_SALVAGE_ITEM_ID) then
 GenericLootUpdate("items")
 end
 for index = 1, _G.GetNumLanguages() do
 languages_known[_G.GetLanguageByIndex(index)] = true
 end
-item_process_timer_handle = self:ScheduleRepeatingTimer("ProcessItems", 30)
-target_location_timer_handle = self:ScheduleRepeatingTimer("UpdateTargetLocation", 0.5)
+-- These two timers loop indefinitely by constantly resetting their remaining iterations to 100k.
+item_process_timer_handle = C_Timer.NewTicker(30, function()
+item_process_timer_handle._remainingIterations = 100000
+WDP:ProcessItems()
+end, 100000)
+target_location_timer_handle = C_Timer.NewTicker(0.5, function()
+target_location_timer_handle._remainingIterations = 100000
+WDP:UpdateTargetLocation()
+end, 100000)
 _G.hooksecurefunc("UseContainerItem", function(bag_index, slot_index, target_unit)
 if target_unit then
 return
 end
 local item_id = ItemLinkToID(item_link)
 if item_id then
 RecordItemData(item_id, item_link, true)
 end
-loot_toast_data_timer_handle = WDP:ScheduleTimer(ClearLootToastData, 5)
+loot_toast_data_timer_handle = C_Timer.NewTimer(5, ClearLootToastData)
 end
 end
 do
 return
 end
 private.discovered_recipe_name = recipe_name
 private.profession_level = prof_level
-self:ScheduleTimer(IterativeRecordDiscovery, 0.2)
+C_Timer.After(0.2, IterativeRecordDiscovery)
 end
 end
 if currently_drunk then
 if message == _G.DRUNK_MESSAGE_SELF1 or message:match(SOBER_MATCH) then
 ClearKilledNPC()
 else
 --Debug("%s: %s was killed by %s.", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN) -- broken in Patch 5.4
 end
 killed_npc_id = unit_idnum
-WDP:ScheduleTimer(ClearKilledNPC, 0.1)
+C_Timer.After(0.1, ClearKilledNPC)
 end,
 }
 local NON_DAMAGE_EVENTS = {
 end
 end
 ClearLootToastData()
-killed_boss_id_timer_handle = WDP:ScheduleTimer(ClearKilledBossID, 5) -- we need to assign a handle here to cancel it later
+killed_boss_id_timer_handle = C_Timer.NewTimer(5, ClearKilledBossID) -- we need to assign a handle here to cancel it later
 end
 function WDP:UNIT_SPELLCAST_SUCCEEDED(event_name, unit_id, spell_name, spell_rank, spell_line, spell_id)
 if unit_id ~= "player" then
 ClearKilledBossID()
 ClearLootToastContainerID()
 ClearLootToastData()
 private.loot_toast_container_id = private.LOOT_TOAST_CONTAINER_SPELL_ID_TO_ITEM_ID_MAP[spell_id]
-loot_toast_container_timer_handle = WDP:ScheduleTimer(ClearLootToastContainerID, 1) -- we need to assign a handle here to cancel it later
+loot_toast_container_timer_handle = C_Timer.NewTimer(1, ClearLootToastContainerID) -- we need to assign a handle here to cancel it later
 return
 end
 -- For Crates of Salvage (and potentially other items based on spell casts in the future which need manual handling)
 if private.DELAYED_CONTAINER_SPELL_ID_TO_ITEM_ID_MAP[spell_id] then
 -- Set up timer
 Debug("%s: Beginning Salvage loot timer for spellID %d", event_name, spell_id)
-chat_loot_timer_handle = WDP:ScheduleTimer(ClearTimeBasedLootData, 1)
+chat_loot_timer_handle = C_Timer.NewTimer(1, ClearTimeBasedLootData)
 -- Standard item handling setup
 table.wipe(current_action)
 current_loot = nil
 current_action.target_type = AF.ITEM

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 383:d3e8a11a21ea