From 6923e8480e0c1b497e705757778a806759f1773e Mon Sep 17 00:00:00 2001 From: ackis Date: Wed, 25 Feb 2009 05:26:16 +0000 Subject: [PATCH] Oops, tried looking up vendors in the trainer db. Fixed. Ticket #400. --- ARLFrame.lua | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ARLFrame.lua b/ARLFrame.lua index 78f4551..450c0cf 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -281,6 +281,25 @@ local function SetSortString(recipeSkill, recStr) end +-- Description: +-- Expected result: +-- Input: +-- Output: + +local function CheckDisplayFaction(filterDB, faction) + + if (filterDB.general.faction ~= true) then + if ((faction == BFAC[myFaction]) or (faction == BFAC["Neutral"]) or (faction == nil)) then + return true + else + return false + end + else + return true + end + +end + do local function LoadZones(c,y, ...) @@ -365,7 +384,7 @@ do for k, v in pairs(recipeDB[recipeIndex]["Acquire"]) do -- If it's a vendor check to see if we're displaying it if (v["Type"] == 2) then - local display = CheckDisplayFaction(addon.db.profile.filters, trainerDB[v["ID"]]["Faction"]) + local display = CheckDisplayFaction(addon.db.profile.filters, vendorDB[v["ID"]]["Faction"]) maplist[v["ID"]] = display end end @@ -2230,25 +2249,6 @@ end -- Input: -- Output: -local function CheckDisplayFaction(filterDB, faction) - - if (filterDB.general.faction ~= true) then - if ((faction == BFAC[myFaction]) or (faction == BFAC["Neutral"]) or (faction == nil)) then - return true - else - return false - end - else - return true - end - -end - --- Description: --- Expected result: --- Input: --- Output: - local function expandEntry(dsIndex) -- insertIndex is the position in DisplayStrings that we want -- 1.7.9.5