Merge branch 'ryzom/ui/improvements' into yubo

fix_opengl_on_mac
Ulukyn 5 years ago
commit b16d132e1d

@ -2133,8 +2133,9 @@ static void setupEnchantedItem(CSheetHelpSetup &setup, ucstring &itemText)
const CItemSheet *pIS= ctrl->asItemSheet(); const CItemSheet *pIS= ctrl->asItemSheet();
if(pIS && pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL) if(pIS && pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL)
pPM->buildPhraseDesc(enchantInfo, itemInfo.Enchantment, 0, false, "uihelpPhraseCrystalSpellFormat"); pPM->buildPhraseDesc(enchantInfo, itemInfo.Enchantment, 0, false, "uihelpPhraseCrystalSpellFormat");
else else if(!pIS || pIS->Family != ITEMFAMILY::JEWELRY) {
pPM->buildPhraseDesc(enchantInfo, itemInfo.Enchantment, 0, false, "uihelpPhraseEnchantmentFormat"); pPM->buildPhraseDesc(enchantInfo, itemInfo.Enchantment, 0, false, "uihelpPhraseEnchantmentFormat");
}
// replace // replace
strFindReplace(itemText, enchantTag, enchantInfo ); strFindReplace(itemText, enchantTag, enchantInfo );

Loading…
Cancel
Save