WoWInterface SVN Aloft

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /branches/cataclysm/Aloft/AloftCombatText
    from Rev 1888 to Rev 1970
    ↔ Reverse comparison
  •

Rev 1888 → Rev 1970

AloftCombatText.lua
152,6 → 152,7
end
end
 
-- any time the update list is empty, cancel all timers (cleans up potential leaked timers)
if not next(updateList) then
self:CancelAllTimers()
end
196,6 → 197,7
combatTextRegion:Hide()
combatTextRegion:SetText("")
 
-- any time the update list is empty, cancel all timers (cleans up potential leaked timers)
if not next(updateList) then
self:CancelAllTimers()
end
237,7 → 239,7
 
updateList[aloftData] = GetTime()
 
self:CancelAllTimers()
self:CancelAllTimers() -- this is safe here, we use a global timer, which we will be restarting immediately
self:ScheduleRepeatingTimer(function() AloftCombatText:Update() end, 0.05)
 
-- ChatFrame7:AddMessage("AloftCombatText:PostCombatText(): show " .. tostring(aloftData.name) .. "/" .. tostring(text) .. "/" .. tostring(layoutFrame.combatTextRegion:GetText()))
422,22 → 424,31
 
-----------------------------------------------------------------------------
 
local function getNameplate(targetGUId, targetName, nameplateId)
local function getNameplate(targetGUId, rawTargetName, nameplateId)
if targetGUId == AloftCombatText:GetPlayerTargetGUId() then
return Aloft:GetTargetNameplate(targetName)
local targetName, _ = Aloft:ParseUnitName(rawTargetName, nil) -- second return value is not used
local aloftData = Aloft:GetTargetNameplate(targetName)
-- ChatFrame7:AddMessage("AloftCombatText.getNameplate() TGT " .. tostring(aloftData and aloftData.name) .. "/" .. tostring(rawTargetName) .. "/" .. tostring(targetName) .. "/" .. tostring(targetGUId) .. "/" .. tostring(nameplateId))
return aloftData
elseif nameplateId then
local nameplates = Aloft:GetNamedNameplates(targetName)
local targetName, _ = Aloft:ParseUnitName(rawTargetName) -- second return value is not used
local nameplates = Aloft:GetNamedNameplates(targetName, nil)
if nameplates then
for aloftData in pairs(nameplates) do
if nameplateId == AloftTargetTrackingData:GetNameplateId(aloftData) then
-- ChatFrame7:AddMessage("AloftCombatText.getNameplate() ENV " .. tostring(aloftData and aloftData.name) .. "/" .. tostring(rawTargetName) .. "/" .. tostring(targetName) .. "/" .. tostring(targetGUId) .. "/" .. tostring(nameplateId))
return aloftData
end
end
else
-- ChatFrame7:AddMessage("AloftCombatText:getNameplate(): no nameplates " .. tostring(targetName) .. "/" .. tostring(nameplateId))
-- nothing happens here but diagnostics
-- local targetName = Aloft:ParseUnitName(rawTargetName, nil) -- second return value is not used
-- ChatFrame7:AddMessage("AloftCombatText.getNameplate() NON 1 " .. tostring(rawTargetName) .. "/" .. tostring(targetName) .. "/" .. tostring(targetGUId) .. "/" .. tostring(nameplateId))
end
else
-- ChatFrame7:AddMessage("AloftCombatText:getNameplate(): no nameplateId " .. tostring(targetName))
-- nothing happens here but diagnostics
-- local targetName = Aloft:ParseUnitName(rawTargetName, nil) -- second return value is not used
-- ChatFrame7:AddMessage("AloftCombatText.getNameplate() NON 2 " .. tostring(rawTargetName) .. "/" .. tostring(targetName) .. "/" .. tostring(targetGUId) .. "/" .. tostring(nameplateId))
end
return nil
end