From 028658a2be24faa1ec4fe37078fb5127fa785ee4 Mon Sep 17 00:00:00 2001 From: Parnic Date: Tue, 3 Jul 2012 04:30:50 +0000 Subject: [PATCH] - Fixed GetLFGMode() errors in 5.0 --- IceHUD.lua | 33 +++++++++++++++++++++++++++++++++ modules/PlayerHealth.lua | 8 +------- modules/TargetHealth.lua | 8 +------- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/IceHUD.lua b/IceHUD.lua index 2d9c71e..3e86bb3 100644 --- a/IceHUD.lua +++ b/IceHUD.lua @@ -554,6 +554,39 @@ function IceHUD:CreateCustomModuleAndNotify(moduleKey, settings) end end +local function CheckLFGMode(mode) + return (mode ~= nil and mode ~= "abandonedInDungeon" and mode ~= "queued") +end + +function IceHUD:GetIsInLFGGroup() + local mode, submode + if IceHUD.WowVer >= 50000 then + mode, submode = GetLFGMode(LE_LFG_CATEGORY_LFD) + else + mode, submode = GetLFGMode() + end + local IsInLFGGroup = CheckLFGMode(mode) + + if IceHUD.WowVer < 50000 then + return IsInLFGGroup + end + + if not IsInLFGGroup then + mode, submode = GetLFGMode(LE_LFG_CATEGORY_RF) + IsInLFGGroup = CheckLFGMode(mode) + end + if not IsInLFGGroup then + mode, submode = GetLFGMode(LE_LFG_CATEGORY_SCENARIO) + IsInLFGGroup = CheckLFGMode(mode) + end + if not IsInLFGGroup then + mode, submode = GetLFGMode(LE_LFG_CATEGORY_LFR) + IsInLFGGroup = CheckLFGMode(mode) + end + + return IsInLFGGroup +end + local BLACKLISTED_UNIT_MENU_OPTIONS = { SET_FOCUS = "ICEHUD_SET_FOCUS", CLEAR_FOCUS = "ICEHUD_CLEAR_FOCUS", diff --git a/modules/PlayerHealth.lua b/modules/PlayerHealth.lua index 80e25fa..3606776 100644 --- a/modules/PlayerHealth.lua +++ b/modules/PlayerHealth.lua @@ -1005,13 +1005,7 @@ function PlayerHealth.prototype:CheckCombat() end function PlayerHealth.prototype:CheckPartyRole() - local IsLFGParty - local mode, submode - - mode, submode= GetLFGMode() - IsLFGParty = (mode ~= nil and mode ~= "abandonedInDungeon" and mode ~= "queued") - - if configMode or IsLFGParty then + if configMode or IceHUD:GetIsInLFGGroup() then if (configMode or self.moduleSettings.showPartyRoleIcon) and not self.frame.PartyRoleIcon then local isTank, isHeal, isDPS local proposalExists, typeID, id, name diff --git a/modules/TargetHealth.lua b/modules/TargetHealth.lua index 4678917..55c69e3 100644 --- a/modules/TargetHealth.lua +++ b/modules/TargetHealth.lua @@ -1067,13 +1067,7 @@ function IceTargetHealth.prototype:UpdateBar(scale, color, alpha) end function IceTargetHealth.prototype:CheckPartyRole() - local IsLFGParty - local mode, submode - - mode, submode= GetLFGMode() - IsLFGParty = (mode ~= nil and mode ~= "abandonedInDungeon" and mode ~= "queued") - - if self.configMode or IsLFGParty then + if self.configMode or IceHUD:GetIsInLFGGroup() then if self.configMode or self.moduleSettings.showPartyRoleIcon then local isTank, isHeal, isDPS local proposalExists, typeID, id, name