From af5574e4a6b95c038ca81cfcb81079d8c60aa516 Mon Sep 17 00:00:00 2001 From: Parnic Date: Wed, 20 Oct 2010 05:22:27 +0000 Subject: [PATCH] - added local copy of _G.IceHUD to modules that reference it frequently for a minor lookup speed boost --- IceBarElement.lua | 2 ++ IceCastBar.lua | 1 + IceElement.lua | 2 ++ IceHUD.lua | 2 ++ modules/CastBar.lua | 2 ++ modules/ClassPowerCounter.lua | 2 ++ modules/ComboPoints.lua | 2 ++ modules/CustomBar.lua | 2 ++ modules/CustomCDBar.lua | 1 + modules/CustomCount.lua | 2 ++ modules/EclipseBar.lua | 2 ++ modules/LacerateCount.lua | 2 ++ modules/MaelstromCount.lua | 2 ++ modules/PlayerHealth.lua | 2 ++ modules/PlayerMana.lua | 2 ++ modules/Runes.lua | 2 ++ modules/SliceAndDice.lua | 2 ++ modules/SunderCount.lua | 2 ++ modules/TargetHealth.lua | 2 ++ modules/Threat.lua | 2 ++ 20 files changed, 38 insertions(+) diff --git a/IceBarElement.lua b/IceBarElement.lua index 059a80f..ab8b46f 100644 --- a/IceBarElement.lua +++ b/IceBarElement.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local DogTag = nil +local IceHUD = _G.IceHUD + IceBarElement = IceCore_CreateClass(IceElement) IceBarElement.BarTextureWidth = 128 diff --git a/IceCastBar.lua b/IceCastBar.lua index c07e995..99eb000 100644 --- a/IceCastBar.lua +++ b/IceCastBar.lua @@ -1,6 +1,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) IceCastBar = IceCore_CreateClass(IceBarElement) +local IceHUD = _G.IceHUD IceCastBar.Actions = { None = 0, Cast = 1, Channel = 2, Instant = 3, Success = 4, Failure = 5 } diff --git a/IceElement.lua b/IceElement.lua index f6a5d1e..462d266 100644 --- a/IceElement.lua +++ b/IceElement.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local SML = LibStub("LibSharedMedia-3.0") +local IceHUD = _G.IceHUD + IceElement = IceCore_CreateClass() IceElement.TexturePath = IceHUD.Location .. "\\textures\\" diff --git a/IceHUD.lua b/IceHUD.lua index 9692219..ed1369e 100644 --- a/IceHUD.lua +++ b/IceHUD.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) IceHUD = LibStub("AceAddon-3.0"):NewAddon("IceHUD", "AceConsole-3.0") +local IceHUD = IceHUD + local SML = LibStub("LibSharedMedia-3.0") local ACR = LibStub("AceConfigRegistry-3.0") local ConfigDialog = LibStub("AceConfigDialog-3.0") diff --git a/modules/CastBar.lua b/modules/CastBar.lua index d439f82..d629d7b 100644 --- a/modules/CastBar.lua +++ b/modules/CastBar.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local CastBar = IceCore_CreateClass(IceCastBar) +local IceHUD = _G.IceHUD + CastBar.prototype.lagBar = nil CastBar.prototype.spellCastSent = nil diff --git a/modules/ClassPowerCounter.lua b/modules/ClassPowerCounter.lua index 31d9bf8..65514fd 100644 --- a/modules/ClassPowerCounter.lua +++ b/modules/ClassPowerCounter.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) IceClassPowerCounter = IceCore_CreateClass(IceElement) +local IceHUD = _G.IceHUD + IceClassPowerCounter.prototype.runeHeight = 22 IceClassPowerCounter.prototype.runeWidth = 36 IceClassPowerCounter.prototype.numRunes = 3 diff --git a/modules/ComboPoints.lua b/modules/ComboPoints.lua index a424b9a..a4aa8bb 100644 --- a/modules/ComboPoints.lua +++ b/modules/ComboPoints.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local ComboPoints = IceCore_CreateClass(IceElement) +local IceHUD = _G.IceHUD + ComboPoints.prototype.comboSize = 20 -- Constructor -- diff --git a/modules/CustomBar.lua b/modules/CustomBar.lua index 47fdc6f..f42d2aa 100644 --- a/modules/CustomBar.lua +++ b/modules/CustomBar.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) IceCustomBar = IceCore_CreateClass(IceUnitBar) +local IceHUD = _G.IceHUD + local validUnits = {"player", "target", "focus", "focustarget", "pet", "pettarget", "vehicle", "targettarget", "main hand weapon", "off hand weapon"} local buffOrDebuff = {"buff", "debuff"} local validBuffTimers = {"none", "seconds", "minutes:seconds", "minutes"} diff --git a/modules/CustomCDBar.lua b/modules/CustomCDBar.lua index d0e30be..7ca4f02 100644 --- a/modules/CustomCDBar.lua +++ b/modules/CustomCDBar.lua @@ -1,6 +1,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) IceCustomCDBar = IceCore_CreateClass(IceUnitBar) +local IceHUD = _G.IceHUD local validDisplayModes = {"Always", "When ready", "When cooling down"} local validBuffTimers = {"none", "seconds", "minutes:seconds", "minutes"} diff --git a/modules/CustomCount.lua b/modules/CustomCount.lua index 029176e..dd50ea0 100644 --- a/modules/CustomCount.lua +++ b/modules/CustomCount.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) IceCustomCount = IceCore_CreateClass(IceElement) +local IceHUD = _G.IceHUD + IceCustomCount.prototype.countSize = 20 IceCustomCount.prototype.lastPoints = 0 diff --git a/modules/EclipseBar.lua b/modules/EclipseBar.lua index 0530456..1c1abc2 100644 --- a/modules/EclipseBar.lua +++ b/modules/EclipseBar.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local EclipseBar = IceCore_CreateClass(IceBarElement) +local IceHUD = _G.IceHUD + EclipseBar.prototype.barUpdateColor = "EclipseLunar" EclipseBar.prototype.direction = "none" diff --git a/modules/LacerateCount.lua b/modules/LacerateCount.lua index cd945ec..21c56bd 100644 --- a/modules/LacerateCount.lua +++ b/modules/LacerateCount.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local LacerateCount = IceCore_CreateClass(IceElement) +local IceHUD = _G.IceHUD + LacerateCount.prototype.lacerateSize = 20 LacerateCount.prototype.numLacerates = 3 diff --git a/modules/MaelstromCount.lua b/modules/MaelstromCount.lua index aa73ef8..0f51904 100644 --- a/modules/MaelstromCount.lua +++ b/modules/MaelstromCount.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local MaelstromCount = IceCore_CreateClass(IceElement) +local IceHUD = _G.IceHUD + MaelstromCount.prototype.maelstromSize = 20 -- Constructor -- diff --git a/modules/PlayerHealth.lua b/modules/PlayerHealth.lua index ffced31..f08ae78 100644 --- a/modules/PlayerHealth.lua +++ b/modules/PlayerHealth.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local PlayerHealth = IceCore_CreateClass(IceUnitBar) +local IceHUD = _G.IceHUD + PlayerHealth.prototype.resting = nil PlayerHealth.prototype.pendingBlizzardPartyHide = false diff --git a/modules/PlayerMana.lua b/modules/PlayerMana.lua index 5eced6c..c0fc6fd 100644 --- a/modules/PlayerMana.lua +++ b/modules/PlayerMana.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local PlayerMana = IceCore_CreateClass(IceUnitBar) +local IceHUD = _G.IceHUD + PlayerMana.prototype.manaType = nil PlayerMana.prototype.tickStart = nil PlayerMana.prototype.previousEnergy = nil diff --git a/modules/Runes.lua b/modules/Runes.lua index bf92e9b..39bd85c 100644 --- a/modules/Runes.lua +++ b/modules/Runes.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local Runes = IceCore_CreateClass(IceElement) +local IceHUD = _G.IceHUD + -- blizzard cracks me up. the below block is copied verbatim from RuneFrame.lua ;) --Readability == win local RUNETYPE_BLOOD = 1; diff --git a/modules/SliceAndDice.lua b/modules/SliceAndDice.lua index f732d08..ae19c74 100644 --- a/modules/SliceAndDice.lua +++ b/modules/SliceAndDice.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local SliceAndDice = IceCore_CreateClass(IceUnitBar) +local IceHUD = _G.IceHUD + local NetherbladeItemIdList = {29044, 29045, 29046, 29047, 29048} -- Parnic - bah, have to abandon the more robust string representation of each slot because of loc issues... local NetherbladeEquipLocList = {1, 3, 5, 7, 10} --"HeadSlot", "ShoulderSlot", "ChestSlot", "LegsSlot", "HandsSlot"} diff --git a/modules/SunderCount.lua b/modules/SunderCount.lua index d1dda87..964ee06 100644 --- a/modules/SunderCount.lua +++ b/modules/SunderCount.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) local SunderCount = IceCore_CreateClass(IceElement) +local IceHUD = _G.IceHUD + SunderCount.prototype.sunderSize = 20 SunderCount.prototype.numSunders = 3 diff --git a/modules/TargetHealth.lua b/modules/TargetHealth.lua index 105edab..9048537 100644 --- a/modules/TargetHealth.lua +++ b/modules/TargetHealth.lua @@ -1,6 +1,8 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false) IceTargetHealth = IceCore_CreateClass(IceUnitBar) +local IceHUD = _G.IceHUD + IceTargetHealth.prototype.color = nil IceTargetHealth.prototype.determineColor = true IceTargetHealth.prototype.registerEvents = true diff --git a/modules/Threat.lua b/modules/Threat.lua index fd1fef1..850bb43 100644 --- a/modules/Threat.lua +++ b/modules/Threat.lua @@ -7,6 +7,8 @@ Description: adds a threat bar to IceHUD IceThreat = IceCore_CreateClass(IceUnitBar) +local IceHUD = _G.IceHUD + IceThreat.prototype.color = nil IceThreat.aggroBar = nil IceThreat.aggroBarMulti = nil