From d104fcfb219f2152d114e1a9902227f4ba3b8773 Mon Sep 17 00:00:00 2001 From: Parnic Date: Mon, 27 Jul 2009 05:48:12 +0000 Subject: [PATCH] - updated every other reference to a bar's texture to use the accessor method instead. this allows overridden textures to work globally --- modules/FocusHealth.lua | 2 +- modules/HungerForBlood.lua | 2 +- modules/PlayerHealth.lua | 4 ++-- modules/PlayerMana.lua | 2 +- modules/SliceAndDice.lua | 2 +- modules/TargetHealth.lua | 2 +- modules/Threat.lua | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/FocusHealth.lua b/modules/FocusHealth.lua index edc0ccf..de0225c 100644 --- a/modules/FocusHealth.lua +++ b/modules/FocusHealth.lua @@ -283,7 +283,7 @@ function FocusHealth.prototype:CreateBackground() self.frame.button:ClearAllPoints() -- Parnic - kinda hacky, but in order to fit this region to multiple types of bars, we need to do this... -- would be nice to define this somewhere in data, but for now...here we are - if self.settings.barTexture == "HiBar" then + if self:GetMyBarTexture() == "HiBar" then self.frame.button:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", 0, 0) self.frame.button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth(), 0) else diff --git a/modules/HungerForBlood.lua b/modules/HungerForBlood.lua index 9892d53..d86784c 100644 --- a/modules/HungerForBlood.lua +++ b/modules/HungerForBlood.lua @@ -102,7 +102,7 @@ function HungerForBlood.prototype:CreateFrame() self.frame.button:ClearAllPoints() - if self.settings.barTexture == "HiBar" then + if self:GetMyBarTexture() == "HiBar" then self.frame.button:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", 0, 0) self.frame.button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth(), 0) else diff --git a/modules/PlayerHealth.lua b/modules/PlayerHealth.lua index c76d5f5..ea3bb60 100644 --- a/modules/PlayerHealth.lua +++ b/modules/PlayerHealth.lua @@ -708,7 +708,7 @@ function PlayerHealth.prototype:CreateBackground(redraw) self.frame.button:ClearAllPoints() -- Parnic - kinda hacky, but in order to fit this region to multiple types of bars, we need to do this... -- would be nice to define this somewhere in data, but for now...here we are - if self.settings.barTexture == "HiBar" then + if self:GetMyBarTexture() == "HiBar" then self.frame.button:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", 0, 0) self.frame.button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth(), 0) else @@ -741,7 +741,7 @@ function PlayerHealth.prototype:CreateHealBar() self.healFrame.bar = self.frame:CreateTexture(nil, "BACKGROUND") end - self.healFrame.bar:SetTexture(IceElement.TexturePath .. self.settings.barTexture) + self.healFrame.bar:SetTexture(IceElement.TexturePath .. self:GetMyBarTexture()) self.healFrame.bar:SetAllPoints(self.frame) self.healFrame:SetStatusBarTexture(self.healFrame.bar) diff --git a/modules/PlayerMana.lua b/modules/PlayerMana.lua index ca2fcfb..4940f66 100644 --- a/modules/PlayerMana.lua +++ b/modules/PlayerMana.lua @@ -364,7 +364,7 @@ function PlayerMana.prototype:CreateTickerFrame() self.tickerFrame:Hide() end - self.tickerFrame.spark:SetTexture(IceElement.TexturePath .. self.settings.barTexture) + self.tickerFrame.spark:SetTexture(IceElement.TexturePath .. self:GetMyBarTexture()) self.tickerFrame.spark:SetBlendMode("ADD") self.tickerFrame.spark:ClearAllPoints() self.tickerFrame.spark:SetAllPoints(self.tickerFrame) diff --git a/modules/SliceAndDice.lua b/modules/SliceAndDice.lua index cff536f..f34caef 100644 --- a/modules/SliceAndDice.lua +++ b/modules/SliceAndDice.lua @@ -152,7 +152,7 @@ function SliceAndDice.prototype:CreateDurationBar() self.durationFrame.bar = self.frame:CreateTexture(nil, "BACKGROUND") end - self.durationFrame.bar:SetTexture(IceElement.TexturePath .. self.settings.barTexture) + self.durationFrame.bar:SetTexture(IceElement.TexturePath .. self:GetMyBarTexture()) self.durationFrame.bar:SetAllPoints(self.frame) self.durationFrame:SetStatusBarTexture(self.durationFrame.bar) diff --git a/modules/TargetHealth.lua b/modules/TargetHealth.lua index a02bf2c..56710d9 100644 --- a/modules/TargetHealth.lua +++ b/modules/TargetHealth.lua @@ -562,7 +562,7 @@ function IceTargetHealth.prototype:CreateBackground(redraw) self.frame.button:ClearAllPoints() -- Parnic - kinda hacky, but in order to fit this region to multiple types of bars, we need to do this... -- would be nice to define this somewhere in data, but for now...here we are - if self.settings.barTexture == "HiBar" then + if self:GetMyBarTexture() == "HiBar" then self.frame.button:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", 0, 0) self.frame.button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth(), 0) else diff --git a/modules/Threat.lua b/modules/Threat.lua index ad0c5ad..eed4cbd 100644 --- a/modules/Threat.lua +++ b/modules/Threat.lua @@ -166,7 +166,7 @@ function IceThreat.prototype:CreateAggroBar() self.aggroBar.bar = self.aggroBar:CreateTexture(nil, "BACKGROUND") end - self.aggroBar.bar:SetTexture(IceElement.TexturePath .. self.settings.barTexture .. "BG") + self.aggroBar.bar:SetTexture(IceElement.TexturePath .. self:GetMyBarTexture() .. "BG") self.aggroBar.bar:SetAllPoints(self.aggroBar) self.aggroBar:SetStatusBarTexture(self.aggroBar.bar)