Merge with feature-item-icon-buffs

--HG--
branch : yubo
hg/yubo
Nimetu 6 years ago
commit c123f63afd

@ -3374,6 +3374,7 @@ void CDBCtrlSheet::getContextHelp(ucstring &help) const
if (useItemInfoForFamily(item->Family))
{
// call lua function to update tooltip window
_ItemInfoWaiter.sendRequest();
help = _ItemInfoWaiter.infoValidated();
}
else if (!_ContextHelp.empty())
@ -3501,6 +3502,7 @@ void CDBCtrlSheet::getContextHelpToolTip(ucstring &help) const
{
if (useItemInfoForFamily(item->Family))
{
_ItemInfoWaiter.sendRequest();
help = _ItemInfoWaiter.infoValidated();
return;
}

@ -793,7 +793,7 @@ protected:
sint64 _NotifyAnimEndTime;
CControlSheetInfoWaiter _ItemInfoWaiter;
mutable CControlSheetInfoWaiter _ItemInfoWaiter;
private:
mutable TSheetType _ActualType;

Loading…
Cancel
Save