Skip to content

Commit cc09dad

Browse files
committed
Fixups
1 parent 0d7060a commit cc09dad

File tree

4 files changed

+37
-16
lines changed

4 files changed

+37
-16
lines changed

browser.lua

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,16 @@ local function TraceCVar(cvar, value, ...)
7171
end
7272
end
7373
-- Ignore C_CVar.SetCVar hook if it originated from ourselves or CvarUtil.lua or ClassicCvarUtil.lua
74-
if source and not (source:lower():find("[\\/]advancedinterfaceoptions[\\/]") or
75-
source:lower():find("[_\\/]sharedxmlbase[\\/]cvarutil%.lua") or
76-
source:lower():find("[_\\/]sharedxml[\\/]cvarutil%.lua") or
77-
source:lower():find("[_\\/]sharedxml[\\/]classiccvarutil%.lua") or
78-
source:lower():find("[_\\/]sharedxml[\\/]classic[\\/]classiccvarutil%.lua")) then
74+
if
75+
source
76+
and not (
77+
source:lower():find("[\\/]advancedinterfaceoptions[\\/]")
78+
or source:lower():find("[_\\/]sharedxmlbase[\\/]cvarutil%.lua")
79+
or source:lower():find("[_\\/]sharedxml[\\/]cvarutil%.lua")
80+
or source:lower():find("[_\\/]sharedxml[\\/]classiccvarutil%.lua")
81+
or source:lower():find("[_\\/]sharedxml[\\/]classic[\\/]classiccvarutil%.lua")
82+
)
83+
then
7984
local realValue = GetCVar(cvar) -- the client does some conversions to the original value
8085
if SVLoaded then
8186
AdvancedInterfaceOptionsSaved.ModifiedCVars[cvar:lower()] = source .. ":" .. lineNum
@@ -139,7 +144,7 @@ function addon:PopulateCVarPanel(OptionsPanel)
139144
self:ClearFocus()
140145
end)
141146
FilterBox:SetScript("OnEnterPressed", function(self)
142-
self:SetAutoFocus(false) -- Clear focus when enter is pressed because ketho said so
147+
self:SetAutoFocus(false) -- Clear focus when enter is pressed because Ketho said so
143148
self:ClearFocus()
144149
end)
145150
FilterBox:SetScript("OnEditFocusGained", function(self)

cspell.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,60 @@
88
"words": [
99
"ADDONCATEGORIES",
1010
"Ambiguate",
11+
"BGDL",
1112
"BGSOUND",
13+
"bspcache",
1214
"Cata",
1315
"cffaaaaff",
1416
"cffaaffaa",
1517
"cffffaaaa",
1618
"cffffffff",
1719
"cvar",
1820
"cvars",
21+
"daltonize",
1922
"Debuff",
2023
"Debuffs",
2124
"DISPELLABLE",
2225
"Dont",
26+
"Dwmo",
27+
"EROR",
28+
"gpromote",
2329
"GXAPI",
30+
"hbao",
31+
"Hostle",
32+
"HRTF",
33+
"Infov",
34+
"Ketho",
2435
"Lerp",
2536
"Luacheck",
2637
"MAXFPSBK",
38+
"mmhhh",
2739
"MSAA",
40+
"Mult",
2841
"Nagle",
2942
"nebularg",
3043
"NUMDIALOGS",
3144
"PERC",
3245
"PHONG",
3346
"PPAA",
47+
"RAIDSSAO",
48+
"REGEN",
49+
"simd",
3450
"SOUNDFX",
3551
"SSAO",
3652
"TARGETOFTARGET",
3753
"TIPOFTHEDAY",
3854
"UBERTOOLTIPS",
3955
"UISCALE",
56+
"Unshift",
4057
"upvalue",
58+
"USEIPV",
4159
"UVARINFO",
4260
"uvars",
61+
"vsync",
4362
"WAGO",
44-
"WOWI"
63+
"WGOB",
64+
"WOWI",
65+
"WQST"
4566
]
4667
}

cvars.lua

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---@diagnostic disable: undefined-global
2-
local addonName, addon = ...
3-
local _G = _G
2+
local _, addon = ...
43

54
addon.combatProtected = {
65
-- List of cvars that can't be modified in combat
@@ -235,13 +234,10 @@ addon.hiddenOptions = {
235234
["advancedWatchFrame"] = { prettyName = ADVANCED_OBJECTIVES_TEXT, description = OPTION_TOOLTIP_ADVANCED_OBJECTIVES_TEXT, type = "" },
236235
["watchFrameIgnoreCursor"] = { prettyName = OBJECTIVES_IGNORE_CURSOR_TEXT, description = OPTION_TOOLTIP_OBJECTIVES_IGNORE_CURSOR, type = "boolean" },
237236
["guildMemberNotify"] = { prettyName = GUILDMEMBER_ALERT, description = OPTION_TOOLTIP_GUILDMEMBER_ALERT, type = "boolean" },
238-
["showArenaEnemyFrames"] = { prettyName = SHOW_ARENA_ENEMY_FRAMES_TEXT, description = OPTION_TOOLTIP_SHOW_ARENA_ENEMY_FRAMES, type = "boolean" },
239237
["autoClearAFK"] = { prettyName = nil, description = OPTION_TOOLTIP_CLEAR_AFK, type = "boolean" },
240238
["colorblindWeaknessFactor"] = { prettyName = nil, description = OPTION_TOOLTIP_ADJUST_COLORBLIND_STRENGTH, type = "boolean" },
241-
["autoLootDefault"] = { prettyName = nil, description = OPTION_TOOLTIP_AUTO_LOOT_DEFAULT, type = "boolean" },
242239
["autoLootRate"] = { prettyName = "Auto Loot Rate", description = "Rate in milliseconds to tick auto loot", type = "number" },
243240
["ChatAmbienceVolume"] = { prettyName = nil, description = "", type = "boolean" },
244-
["threatShowNumeric"] = { prettyName = nil, description = OPTION_TOOLTIP_SHOW_NUMERIC_THREAT, type = "boolean" },
245241
["rightActionBar"] = { prettyName = nil, description = OPTION_TOOLTIP_SHOW_MULTIBAR3, type = "boolean" },
246242
["emphasizeMySpellEffects"] = { prettyName = nil, description = OPTION_TOOLTIP_EMPHASIZE_MY_SPELLS, type = "boolean" },
247243
["chatBubblesParty"] = { prettyName = nil, description = OPTION_TOOLTIP_PARTY_CHAT_BUBBLES, type = "boolean" },
@@ -376,7 +372,6 @@ addon.hiddenOptions = {
376372
["Sound_EnablePositionalLowPassFilter"] = { prettyName = ENABLE_SOFTWARE_HRTF, description = OPTION_TOOLTIP_ENABLE_SOFTWARE_HRTF, type = "boolean" },
377373

378374
["showTargetOfTarget"] = { prettyName = nil, description = OPTION_TOOLTIP_SHOW_TARGET_OF_TARGET, type = "boolean" },
379-
["guildMemberNotify"] = { prettyName = nil, description = OPTION_TOOLTIP_GUILDMEMBER_ALERT, type = "boolean" },
380375
["showTutorials"] = { prettyName = SHOW_TUTORIALS, description = OPTION_TOOLTIP_SHOW_TUTORIALS, type = "boolean" },
381376
["lossOfControl"] = { prettyName = nil, description = OPTION_TOOLTIP_LOSS_OF_CONTROL, type = "boolean" },
382377
["blockChannelInvites"] = { prettyName = nil, description = OPTION_TOOLTIP_BLOCK_CHAT_CHANNEL_INVITE, type = "boolean" },
@@ -685,7 +680,7 @@ addon.hiddenOptions = {
685680
-- ["bloatTest"] = {},
686681
-- ["bloatnameplates"] = {},
687682
-- ["bloatthreat"] = {},
688-
["bodyQuota"] = { description = "Maximum number of componented bodies seen at once" },
683+
["bodyQuota"] = { description = "Maximum number of component bodies seen at once" },
689684
["breakUpLargeNumbers"] = { description = "Toggles using commas in large numbers" },
690685
["bspcache"] = { description = "BSP node caching" },
691686
["calendarShowBattlegrounds"] = { description = "Whether Battleground holidays should appear in the calendar" },
@@ -1171,7 +1166,7 @@ function addon:GetCVars()
11711166
if
11721167
info.commandType == 0 -- cvar, rather than script
11731168
and info.category ~= 0 -- ignore debug category
1174-
and not strfind(info.command:lower(), "debug") -- a number of commands with "debug" in their name are inexplicibly not in the "debug" category
1169+
and not strfind(info.command:lower(), "debug") -- a number of commands with "debug" in their name are inexplicably not in the "debug" category
11751170
and info.category ~= 8 -- ignore GM category
11761171
and addon:CVarExists(info.command) -- real cvar?
11771172
then

gui/CombatConfigPanel.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function addon:CreateCombatOptions()
6666
SpellQueueWindow = {
6767
type = "range",
6868
name = LAG_TOLERANCE,
69-
desc = "Determines how far ahead of the 'end of a spell' start-recovery spell system can be, before allowing spell request to be sent to the server. Ie this controls the built-in lag for the ability queuing system. Ideally, you'll want to set this to your in-game latency.",
69+
desc = "Determines how far ahead of the 'end of a spell' start-recovery spell system can be, before allowing spell request to be sent to the server. Ie this controls the built-in lag for the ability queuing system.",
7070
min = 0,
7171
max = 400,
7272
step = 1,

0 commit comments

Comments
 (0)