Merge branch 'main' into TU43

2026-05-28 16:33:20 -04:00
parent 31d5c12f8f b7393ab153
commit 253460c5df
8 changed files with 145 additions and 85 deletions
@@ -916,7 +916,7 @@ void IUIScene_CraftingMenu::UpdateHighlight()

 		// special case for the torch coal/charcoal
 		int id=pTempItemInstAdditional->getDescriptionId();
-		LPCWSTR itemstring;
+		wstring itemstring;

 		switch(id)
 		{
@@ -945,11 +945,15 @@ void IUIScene_CraftingMenu::UpdateHighlight()
 			}
 			break;
 		default:
-			itemstring=app.GetString(id  );
+			if (pTempItemInstAdditional->hasCustomHoverName()) {
+				itemstring = pTempItemInstAdditional->getHoverName();
+			} else {
+				itemstring = app.GetString(id);
+			}
 			break;
 		}

-		setItemText(itemstring);
+		setItemText(itemstring.c_str());
 	}
 	else
 	{