Skip to content

Commit

Permalink
Vendor Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
coding-red-panda committed Jun 13, 2015
1 parent a35139b commit 3667cde
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
13 changes: 8 additions & 5 deletions Generalist.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1645,12 +1645,15 @@ function Generalist:AddTooltipInfo(wndParent, wndTooltip, item)
-- Make sure we actually have a tooltip to work with
if wndTooltip == nil then return end

local wndInv = Apollo.LoadForm(self.xmlDoc, "TooltipInventorySummary",
wndTooltip:FindChild("Items"), self)
local wndInv = Apollo.LoadForm(self.xmlDoc, "TooltipInventorySummary", wndTooltip:FindChild("Items"), self)

-- Carbine changed something in the Vendor Tooltips, making our hook not work.
-- Disabling this now for those vendors.
if wndInv == nil then return end

local wndList = wndInv:FindChild("TooltipInventoryList")

-- Now we loop through everyone's inventory to find matches.

-- Now we loop through everyone's inventory to find matches.
-- Get the current character's faction
local factID = GameLib.GetPlayerUnit():GetFaction()

Expand Down Expand Up @@ -1997,4 +2000,4 @@ end
-- Instantiation
-----------------------------------------------------------------------------------------------
local GeneralistInstance = Generalist:new()
GeneralistInstance:Init()
GeneralistInstance:Init()
2 changes: 1 addition & 1 deletion toc.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Addon Author="sk4p" APIVersion="10" Name="Generalist" Description="A handy tool for managing alternate characters." Version="1.0.0">
<Addon Author="sk4p" APIVersion="10" Name="Generalist" Description="A handy tool for managing alternate characters." Version="1.0.1">
<Script Name="Generalist.lua"/>
<Form Name="Generalist.xml"/>
</Addon>

0 comments on commit 3667cde

Please sign in to comment.