mirror of
https://github.com/neoStudiosLCE/neoLegacy.git
synced 2026-08-20 09:57:09 +00:00
Merge remote-tracking branch 'origin/main' into exp/worldgen
This commit is contained in:
commit
8108d050cb
|
|
@ -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
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue