X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/d9dbaac4fed539836f421fa57782cefaf6d530fc..4a66dd6d6fe87c9e881b0c7d62ca339907619d4d:/OmaRF/Events.lua

diff --git a/OmaRF/Events.lua b/OmaRF/Events.lua
index 26565ab..2cbcb41 100644
--- a/OmaRF/Events.lua
+++ b/OmaRF/Events.lua
@@ -11,11 +11,11 @@ local UnitIsAFK, UnitIsDND = UnitIsAFK, UnitIsDND;
 local UnitGetIncomingHeals, UnitGetTotalAbsorbs = UnitGetIncomingHeals, UnitGetTotalAbsorbs;
 local UnitThreatSituation, GetThreatStatusColor = UnitThreatSituation, GetThreatStatusColor;
 local UnitIsDeadOrGhost, UnitIsConnected = UnitIsDeadOrGhost, UnitIsConnected;
-local UnitHasIncomingResurrection = UnitHasIncomingResurrection;
 local UnitGetTotalHealAbsorbs = UnitGetTotalHealAbsorbs;
 local UnitHasVehicleUI, UnitTargetsVehicleInRaidUI = UnitHasVehicleUI, UnitTargetsVehicleInRaidUI;
 local GetReadyCheckTimeLeft, GetReadyCheckStatus = GetReadyCheckTimeLeft, GetReadyCheckStatus;
 local UnitGroupRolesAssigned = UnitGroupRolesAssigned;
+local GetRaidTargetIndex, SetRaidTargetIconTexture = GetRaidTargetIndex, SetRaidTargetIconTexture;
 local RAID_CLASS_COLORS = RAID_CLASS_COLORS;
 local READY_CHECK_READY_TEXTURE = READY_CHECK_READY_TEXTURE;
 local READY_CHECK_NOT_READY_TEXTURE = READY_CHECK_NOT_READY_TEXTURE;
@@ -39,6 +39,7 @@ function M.RegisterEvents(frame)
     frame:RegisterEvent("READY_CHECK");
     frame:RegisterEvent("READY_CHECK_FINISHED");
     frame:RegisterEvent("GROUP_ROSTER_UPDATE");
+    frame:RegisterEvent("RAID_TARGET_UPDATE");
     if frame.unit == "focus" then frame:RegisterEvent("PLAYER_FOCUS_CHANGED") end
 end
 
@@ -70,7 +71,6 @@ end
 
 function M.RegisterUnitEvents(frame)
     -- events are taken from FrameXML/CompactUnitFrame.lua
-    -- TODO raid marker support
     local displayed = frame.unit ~= frame.displayed and frame.displayed or nil;
     frame:RegisterUnitEvent("UNIT_HEALTH", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_HEALTH_FREQUENT", frame.unit, displayed);
@@ -82,13 +82,11 @@ function M.RegisterUnitEvents(frame)
     frame:RegisterUnitEvent("UNIT_HEAL_ABSORB_AMOUNT_CHANGED", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_THREAT_SITUATION_UPDATE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_CONNECTION", frame.unit, displayed);
-    frame:RegisterUnitEvent("INCOMING_RESURRECT_CHANGED", frame.unit, displayed);
     frame:RegisterUnitEvent("PLAYER_FLAGS_CHANGED", frame.unit, displayed);
     frame:RegisterUnitEvent("READY_CHECK_CONFIRM", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_ENTERED_VEHICLE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_EXITED_VEHICLE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_PET", frame.unit, displayed);
-    frame:RegisterUnitEvent("RAID_TARGET_UPDATE", frame.unit, displayed);
 end
 local registerUnitEvents = M.RegisterUnitEvents;
 
@@ -142,11 +140,6 @@ local function updateText(frame, unit)
     end
 end
 
-local function updateIncomingRes(frame, unit)
-    if UnitHasIncomingResurrection(unit) then frame.rez:Show();
-    else frame.rez:Hide(); end
-end
-
 local function updateMaxPower(frame, unit)
     frame.mana.max = UnitPowerMax(unit);
 end
@@ -287,22 +280,20 @@ local function updateRole(frame, unit)
     if role == "HEALER" then
         frame.role:SetTexCoord(0.75, 1, 0, 1);
         frame.role:Show();
-        if not frame.role.healer then
-            registerPower(frame);
-            frame.role.healer = true;
-        end
+        registerPower(frame);
+        frame.role.healer = true;
     elseif role == "TANK" then
         frame.role:SetTexCoord(0.5, 0.75, 0, 1);
         frame.role:Show();
         if frame.role.healer then
-            unregisterPower(frame);
             frame.role.healer = false;
+            unregisterPower(frame);
         end
     else
         frame.role:Hide();
         if frame.role.healer then
-            unregisterPower(frame);
             frame.role.healer = false;
+            unregisterPower(frame);
         end
     end
 end
@@ -324,7 +315,13 @@ local function updateReadyCheck(frame, unit)
 end
 
 local function updateRaidMarker(frame, unit)
-    --print(unit, "marker");
+    local index = GetRaidTargetIndex(unit);
+    if index then
+        SetRaidTargetIconTexture(frame.targeticon, index);
+        frame.targeticon:Show();
+    else
+        frame.targeticon:Hide();
+    end
 end
 
 local eventFuncs = {
@@ -378,9 +375,6 @@ local eventFuncs = {
     ["UNIT_CONNECTION"] = function(frame)
         updateText(frame, frame.displayed);
     end,
-    ["INCOMING_RESURRECT_CHANGED"] = function(frame)
-        updateIncomingRes(frame, frame.unit);
-    end,
     ["PARTY_MEMBER_ENABLE"] = function(frame)
         -- new power info possibly (FrameXML/CompactUnitFrame.lua)
         updateMaxPower(frame, frame.displayed);
@@ -393,7 +387,7 @@ local eventFuncs = {
         updateReadyCheck(frame, frame.unit);
     end,
     ["RAID_TARGET_UPDATE"] = function(frame)
-        updateRaidMarker(frame, frame.unit);
+        updateRaidMarker(frame, frame.displayed);
     end,
     ["UPDATE_ALL_BARS"] = function(frame)
         updateRole(frame, frame.unit);
@@ -412,9 +406,8 @@ local eventFuncs = {
         updateHealAbsorb(frame, frame.displayed);
         updateAggro(frame, frame.displayed);
         updateName(frame, frame.displayed);
-        updateIncomingRes(frame, frame.unit);
         updateReadyCheck(frame, frame.unit);
-        updateRaidMarker(frame, frame.unit);
+        updateRaidMarker(frame, frame.displayed);
     end,
 };
 eventFuncs["UNIT_HEALTH_FREQUENT"] = eventFuncs["UNIT_HEALTH"];