Skip to content

Commit 908c167

Browse files
committed
Fix floating combat text reference to globals that no longer exist?
1 parent 58a6505 commit 908c167

File tree

1 file changed

+39
-37
lines changed

1 file changed

+39
-37
lines changed

gui/FloatingCombatTextConfigPanel.lua

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,51 @@ local HALF_WIDTH = 1.5
88
-------------------------------------------------------------------------
99

1010
-- UVARINFO was made local in patch 8.2.0
11-
local uvars = {
12-
removeChatDelay = "REMOVE_CHAT_DELAY",
13-
lockActionBars = "LOCK_ACTIONBAR",
14-
buffDurations = "SHOW_BUFF_DURATIONS",
15-
alwaysShowActionBars = "ALWAYS_SHOW_MULTIBARS",
16-
showPartyPets = "SHOW_PARTY_PETS",
17-
showPartyBackground = "SHOW_PARTY_BACKGROUND",
18-
showTargetOfTarget = "SHOW_TARGET_OF_TARGET",
19-
autoQuestWatch = "AUTO_QUEST_WATCH",
20-
lootUnderMouse = "LOOT_UNDER_MOUSE",
21-
autoLootDefault = "AUTO_LOOT_DEFAULT",
22-
enableFloatingCombatText = "SHOW_COMBAT_TEXT",
23-
floatingCombatTextLowManaHealth = "COMBAT_TEXT_SHOW_LOW_HEALTH_MANA",
24-
floatingCombatTextAuras = "COMBAT_TEXT_SHOW_AURAS",
25-
floatingCombatTextAuraFade = "COMBAT_TEXT_SHOW_AURA_FADE",
26-
floatingCombatTextCombatState = "COMBAT_TEXT_SHOW_COMBAT_STATE",
27-
floatingCombatTextDodgeParryMiss = "COMBAT_TEXT_SHOW_DODGE_PARRY_MISS",
28-
floatingCombatTextDamageReduction = "COMBAT_TEXT_SHOW_RESISTANCES",
29-
floatingCombatTextRepChanges = "COMBAT_TEXT_SHOW_REPUTATION",
30-
floatingCombatTextReactives = "COMBAT_TEXT_SHOW_REACTIVES",
31-
floatingCombatTextFriendlyHealers = "COMBAT_TEXT_SHOW_FRIENDLY_NAMES",
32-
floatingCombatTextComboPoints = "COMBAT_TEXT_SHOW_COMBO_POINTS",
33-
floatingCombatTextEnergyGains = "COMBAT_TEXT_SHOW_ENERGIZE",
34-
floatingCombatTextPeriodicEnergyGains = "COMBAT_TEXT_SHOW_PERIODIC_ENERGIZE",
35-
floatingCombatTextFloatMode = "COMBAT_TEXT_FLOAT_MODE",
36-
floatingCombatTextHonorGains = "COMBAT_TEXT_SHOW_HONOR_GAINED",
37-
showCastableBuffs = "SHOW_CASTABLE_BUFFS",
38-
showDispelDebuffs = "SHOW_DISPELLABLE_DEBUFFS",
39-
showArenaEnemyFrames = "SHOW_ARENA_ENEMY_FRAMES",
40-
showArenaEnemyCastbar = "SHOW_ARENA_ENEMY_CASTBAR",
41-
showArenaEnemyPets = "SHOW_ARENA_ENEMY_PETS",
42-
}
11+
-- FIXME: These globals don't seem to exist in 12.0.0
12+
-- local uvars = {
13+
-- removeChatDelay = "REMOVE_CHAT_DELAY",
14+
-- lockActionBars = "LOCK_ACTIONBAR",
15+
-- buffDurations = "SHOW_BUFF_DURATIONS",
16+
-- alwaysShowActionBars = "ALWAYS_SHOW_MULTIBARS",
17+
-- showPartyPets = "SHOW_PARTY_PETS",
18+
-- showPartyBackground = "SHOW_PARTY_BACKGROUND",
19+
-- showTargetOfTarget = "SHOW_TARGET_OF_TARGET",
20+
-- autoQuestWatch = "AUTO_QUEST_WATCH",
21+
-- lootUnderMouse = "LOOT_UNDER_MOUSE",
22+
-- autoLootDefault = "AUTO_LOOT_DEFAULT",
23+
-- enableFloatingCombatText = "SHOW_COMBAT_TEXT",
24+
-- floatingCombatTextLowManaHealth = "COMBAT_TEXT_SHOW_LOW_HEALTH_MANA",
25+
-- floatingCombatTextAuras = "COMBAT_TEXT_SHOW_AURAS",
26+
-- floatingCombatTextAuraFade = "COMBAT_TEXT_SHOW_AURA_FADE",
27+
-- floatingCombatTextCombatState = "COMBAT_TEXT_SHOW_COMBAT_STATE",
28+
-- floatingCombatTextDodgeParryMiss = "COMBAT_TEXT_SHOW_DODGE_PARRY_MISS",
29+
-- floatingCombatTextDamageReduction = "COMBAT_TEXT_SHOW_RESISTANCES",
30+
-- floatingCombatTextRepChanges = "COMBAT_TEXT_SHOW_REPUTATION",
31+
-- floatingCombatTextReactives = "COMBAT_TEXT_SHOW_REACTIVES",
32+
-- floatingCombatTextFriendlyHealers = "COMBAT_TEXT_SHOW_FRIENDLY_NAMES",
33+
-- floatingCombatTextComboPoints = "COMBAT_TEXT_SHOW_COMBO_POINTS",
34+
-- floatingCombatTextEnergyGains = "COMBAT_TEXT_SHOW_ENERGIZE",
35+
-- floatingCombatTextPeriodicEnergyGains = "COMBAT_TEXT_SHOW_PERIODIC_ENERGIZE",
36+
-- floatingCombatTextFloatMode = "COMBAT_TEXT_FLOAT_MODE",
37+
-- floatingCombatTextHonorGains = "COMBAT_TEXT_SHOW_HONOR_GAINED",
38+
-- showCastableBuffs = "SHOW_CASTABLE_BUFFS",
39+
-- showDispelDebuffs = "SHOW_DISPELLABLE_DEBUFFS",
40+
-- showArenaEnemyFrames = "SHOW_ARENA_ENEMY_FRAMES",
41+
-- showArenaEnemyCastbar = "SHOW_ARENA_ENEMY_CASTBAR",
42+
-- showArenaEnemyPets = "SHOW_ARENA_ENEMY_PETS",
43+
-- }
4344

4445
local function BlizzardOptionsPanel_UpdateCombatText()
45-
-- Hack to call CombatText_UpdateDisplayedMessages which only exists if the Blizzard_CombatText AddOn is loaded
46-
if CombatText_UpdateDisplayedMessages then
47-
CombatText_UpdateDisplayedMessages()
46+
-- Hack to call CombatText.UpdateDisplayedMessages which only exists if the Blizzard_CombatText AddOn is loaded
47+
if CombatText and CombatText.UpdateDisplayedMessages then
48+
CombatText:UpdateDisplayedMessages()
4849
end
4950
end
5051

5152
local function FCT_SetValue(cvar, checked)
52-
_G[uvars[cvar]] = checked and "1" or "0"
53-
BlizzardOptionsPanel_UpdateCombatText()
53+
-- FIXME: These globals don't seem to exist in 12.0.0
54+
-- _G[uvars[cvar]] = checked and "1" or "0"
55+
-- BlizzardOptionsPanel_UpdateCombatText()
5456
end
5557

5658
-------------------------------------------------------------------------

0 commit comments

Comments
 (0)