From: Aleksi Blinnikka Date: Thu, 15 Mar 2018 09:13:07 +0000 (+0200) Subject: Remove most healabsorb, remove concatenation from event handlers X-Git-Url: https://www.aleksib.fi/git/wowui.git/commitdiff_plain/3f90dc319e4001bc0c10c00d3cd00a81a51b220c?ds=sidebyside Remove most healabsorb, remove concatenation from event handlers --- diff --git a/OmaUF/Events.lua b/OmaUF/Events.lua index 8121ae6..59b8592 100644 --- a/OmaUF/Events.lua +++ b/OmaUF/Events.lua @@ -251,6 +251,10 @@ local function updateStatus(frame, unit) end end +local pvpIcons = { + Alliance = "Interface\\TARGETINGFRAME\\UI-PVP-Alliance", + Horde = "Interface\\TARGETINGFRAME\\UI-PVP-Horde" +}; local function updatePVP(frame, unit) if UnitIsPVPFreeForAll(unit) then frame.pvp:SetTexture("Interface\\TARGETINGFRAME\\UI-PVP-FFA"); @@ -266,7 +270,7 @@ local function updatePVP(frame, unit) faction = "Horde"; end end - frame.pvp:SetTexture("Interface\\TARGETINGFRAME\\UI-PVP-"..faction); + frame.pvp:SetTexture(pvpIcons[faction]); frame.pvp:Show(); else frame.pvp:Hide(); diff --git a/OmaUF/PetFrame.lua b/OmaUF/PetFrame.lua index a4d8fa5..67d433b 100644 --- a/OmaUF/PetFrame.lua +++ b/OmaUF/PetFrame.lua @@ -14,7 +14,6 @@ local bgColor = Settings.BgColor; local healthColor = Settings.HealthColor; local shieldColor = Settings.ShieldColor; local shieldhlColor = Settings.ShieldhlColor; -local healabsorbColor = Settings.HealabsorbColor; local width, height = Settings.Pet.Width, Settings.Pet.Height; local anchorX, anchorY = Settings.Pet.AnchorX, Settings.Pet.AnchorY; -- placeholders with visible values when error happens diff --git a/OmaUF/PlayerFrame.lua b/OmaUF/PlayerFrame.lua index 960591d..38f19cf 100644 --- a/OmaUF/PlayerFrame.lua +++ b/OmaUF/PlayerFrame.lua @@ -16,7 +16,6 @@ local bgColor = Settings.BgColor; local healthColor = Settings.HealthColor; local shieldColor = Settings.ShieldColor; local shieldhlColor = Settings.ShieldhlColor; -local healabsorbColor = Settings.HealabsorbColor; local width, height = Settings.Player.Width, Settings.Player.Height; local anchorX, anchorY = Settings.Player.AnchorX, Settings.Player.AnchorY; -- placeholders with visible values when error happens diff --git a/OmaUF/TargetFrame.lua b/OmaUF/TargetFrame.lua index a4c2c58..1c0893e 100644 --- a/OmaUF/TargetFrame.lua +++ b/OmaUF/TargetFrame.lua @@ -17,7 +17,6 @@ local bgColor = Settings.BgColor; local healthColor = Settings.HealthColor; local shieldColor = Settings.ShieldColor; local shieldhlColor = Settings.ShieldhlColor; -local healabsorbColor = Settings.HealabsorbColor; local width, height = Settings.Target.Width, Settings.Target.Height; local anchorX, anchorY = Settings.Target.AnchorX, Settings.Target.AnchorY; -- placeholders with visible values when error happens