Merge remote-tracking branch 'origin/main' into exp/worldgen

This commit is contained in:
github-actions 2026-05-28 14:21:44 +00:00
commit 8108d050cb

View file

@ -916,7 +916,7 @@ void IUIScene_CraftingMenu::UpdateHighlight()
// special case for the torch coal/charcoal // special case for the torch coal/charcoal
int id=pTempItemInstAdditional->getDescriptionId(); int id=pTempItemInstAdditional->getDescriptionId();
LPCWSTR itemstring; wstring itemstring;
switch(id) switch(id)
{ {
@ -945,11 +945,15 @@ void IUIScene_CraftingMenu::UpdateHighlight()
} }
break; break;
default: default:
itemstring=app.GetString(id ); if (pTempItemInstAdditional->hasCustomHoverName()) {
itemstring = pTempItemInstAdditional->getHoverName();
} else {
itemstring = app.GetString(id);
}
break; break;
} }
setItemText(itemstring); setItemText(itemstring.c_str());
} }
else else
{ {