Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Fixed: Range/melee weapon buffs not displayed in tooltip

Browse Source 
--HG--
branch : patches-from-atys
Nimetu 6 years ago
parent 4baed9c664
commit 3b0324ad08
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File

20
code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
Unescape Escape View File

@ -3161,7 +3161,11 @@ void CDBCtrlSheet::getContextHelp(ucstring &help) const
const CItemSheet *item= asItemSheet(); const CItemSheet *item= asItemSheet();
if(item) if(item)
{ {
if (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL || item->Family == ITEMFAMILY::JEWELRY || item->Family == ITEMFAMILY::ARMOR) if (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL
|| item->Family == ITEMFAMILY::JEWELRY
|| item->Family == ITEMFAMILY::ARMOR
|| item->Family == ITEMFAMILY::MELEE_WEAPON
|| item->Family == ITEMFAMILY::RANGE_WEAPON)
{ {
string luaMethodName = ( (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL) ? "updateCrystallizedSpellTooltip" : "updateBuffItemTooltip"); string luaMethodName = ( (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL) ? "updateCrystallizedSpellTooltip" : "updateBuffItemTooltip");
CDBCtrlSheet *ctrlSheet = const_cast<CDBCtrlSheet*>(this); CDBCtrlSheet *ctrlSheet = const_cast<CDBCtrlSheet*>(this);
@ -3306,9 +3310,12 @@ void CDBCtrlSheet::getContextHelpToolTip(ucstring &help) const
const CItemSheet *item = asItemSheet(); const CItemSheet *item = asItemSheet();
if (item) if (item)
{ {
if (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL if (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL
|| item->Family == ITEMFAMILY::JEWELRY || item->Family == ITEMFAMILY::ARMOR) || item->Family == ITEMFAMILY::JEWELRY
{ || item->Family == ITEMFAMILY::ARMOR
|| item->Family == ITEMFAMILY::MELEE_WEAPON
|| item->Family == ITEMFAMILY::RANGE_WEAPON)
{
string luaMethodName = (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL) ? "updateCrystallizedSpellTooltip" : "updateBuffItemTooltip"; string luaMethodName = (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL) ? "updateCrystallizedSpellTooltip" : "updateBuffItemTooltip";
CDBCtrlSheet *ctrlSheet = const_cast<CDBCtrlSheet*>(this); CDBCtrlSheet *ctrlSheet = const_cast<CDBCtrlSheet*>(this);
if ( ! getInventory().isItemInfoUpToDate(getInventory().getItemSlotId(ctrlSheet))) if ( ! getInventory().isItemInfoUpToDate(getInventory().getItemSlotId(ctrlSheet)))
@ -4468,7 +4475,10 @@ std::string CDBCtrlSheet::getContextHelpWindowName() const
{ {
return "crystallized_spell_context_help"; return "crystallized_spell_context_help";
} }
else if (item->Family == ITEMFAMILY::JEWELRY || item->Family == ITEMFAMILY::ARMOR) else if (item->Family == ITEMFAMILY::JEWELRY
|| item->Family == ITEMFAMILY::ARMOR
|| item->Family == ITEMFAMILY::MELEE_WEAPON
|| item->Family == ITEMFAMILY::RANGE_WEAPON)
{ {
return "buff_item_context_help"; return "buff_item_context_help";
} }

Write Preview
Loading…
Cancel
Save