feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -43,9 +43,9 @@ ListTag<CompoundTag> *EnchantedBookItem::getEnchantments(shared_ptr<ItemInstance
|
||||
return (ListTag<CompoundTag> *) item->tag->get((wchar_t *)TAG_STORED_ENCHANTMENTS.c_str());
|
||||
}
|
||||
|
||||
void EnchantedBookItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<wstring> *lines, bool advanced, vector<wstring> &unformattedStrings)
|
||||
void EnchantedBookItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<HtmlString> *lines, bool advanced)
|
||||
{
|
||||
Item::appendHoverText(itemInstance, player, lines, advanced, unformattedStrings);
|
||||
Item::appendHoverText(itemInstance, player, lines, advanced);
|
||||
|
||||
ListTag<CompoundTag> *list = getEnchantments(itemInstance);
|
||||
|
||||
@@ -59,8 +59,7 @@ void EnchantedBookItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, s
|
||||
|
||||
if (Enchantment::enchantments[type] != NULL)
|
||||
{
|
||||
lines->push_back(Enchantment::enchantments[type]->getFullname(level, unformatted));
|
||||
unformattedStrings.push_back(unformatted);
|
||||
lines->push_back(Enchantment::enchantments[type]->getFullname(level));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user