c809e5d - Add name prefix when in vehicle

[wowui.git] / OmaUF / UnitFrames.lua

diff --git a/OmaUF/UnitFrames.lua b/OmaUF/UnitFrames.lua
index f477e37..1fd993d 100644 (file)
--- a/OmaUF/UnitFrames.lua
+++ b/OmaUF/UnitFrames.lua
@@ -2,11 +2,8 @@
 local _;
 local pairs = pairs;
 local InCombatLockdown = InCombatLockdown;
-local CTimerAfter = C_Timer.After;
 
-local updateAuraTooltips = OmaUFAuras.UpdateAuraTooltips;
-
-local UnitFrames = CreateFrame("Frame", "OmaUnitFrames", UIParent);
+local UnitFrames = CreateFrame("Frame", "OmaUnitFrame", UIParent);
 
 local M = {};
 OmaUnitFrames = M;
@@ -33,16 +30,17 @@ local function hideBlizzardFrames()
         WarlockPowerFrame, MonkHarmonyBarFrame, PaladinPowerBarFrame,
         MageArcaneChargesFrame, CastingBarFrame, PetCastingBarFrame};
     for i = 1,MAX_BOSS_FRAMES do
-        --table.insert(frames, _G["Boss"..i.."TargetFrame"]);
-        --table.insert(frames, _G["Boss"..i.."TargetFrameHealthBar"]);
-        --table.insert(frames, _G["Boss"..i.."TargetFrameManaBar"]);
+        table.insert(frames, _G["Boss"..i.."TargetFrame"]);
+        table.insert(frames, _G["Boss"..i.."TargetFrameHealthBar"]);
+        table.insert(frames, _G["Boss"..i.."TargetFrameManaBar"]);
+        -- keep boss frame powerBarAlt
     end
     for _, frame in pairs(frames) do
         frame:UnregisterAllEvents();
         if frame.healthbar then frame.healthbar:UnregisterAllEvents() end
         if frame.manabar then frame.manabar:UnregisterAllEvents() end
         if frame.spellbar then frame.spellbar:UnregisterAllEvents() end
-        if frame.powerBarAlt then frame.powerBarAlt:UnregisterAllEvents() end
+        --if frame.powerBarAlt then frame.powerBarAlt:UnregisterAllEvents() end
         frame:Hide();
     end
 
@@ -62,7 +60,6 @@ local hiddenFrame = CreateFrame("Frame");
 hiddenFrame:Hide();
 local arenaHidden = false;
 local function hideArenaFrames()
-    -- not run if /reload happens in combat, may cause problems?
     if not arenaHidden and not InCombatLockdown() then
         arenaHidden = true;
         ArenaEnemyFrames:UnregisterAllEvents();
@@ -73,22 +70,10 @@ local function hideArenaFrames()
     end
 end
 
-local function updateTooltipFuncs()
-    -- let MoveAnything hook these to anchor tooltip elsewhere
-    M.UpdatePlayerTooltips();
-    M.UpdatePetTooltips();
-    M.UpdateTargetTooltips();
-    M.UpdateBossTooltips();
-    updateAuraTooltips();
-end
-
 UnitFrames:RegisterEvent("PLAYER_LOGIN");
-UnitFrames:RegisterEvent("PLAYER_ENTERING_WORLD");
 UnitFrames:RegisterEvent("ADDON_LOADED");
 UnitFrames:SetScript("OnEvent", function(self, event, addon)
-    if event == "PLAYER_ENTERING_WORLD" then
-        CTimerAfter(0.01, updateTooltipFuncs);
-    elseif event == "ADDON_LOADED" and addon == "Blizzard_ArenaUI" then
+    if event == "ADDON_LOADED" and addon == "Blizzard_ArenaUI" then
         hideArenaFrames();
     elseif event == "PLAYER_LOGIN" then
         OmaUFLoadChar();