TU19: merge Minecraft.Client/Platform/Common/Tutorial

This commit is contained in:
Tropical
2026-03-22 03:51:48 -05:00
parent 86c3e12e7b
commit 58cdba39f3
17 changed files with 717 additions and 129 deletions

View File

@@ -42,12 +42,13 @@ bool LookAtTileHint::onLookAt(int id, int iData) {
message->m_icon = TUTORIAL_NO_ICON;
} else {
message->m_icon = id;
if (m_iDataOverride > -1) {
message->m_iAuxVal = m_iDataOverride;
} else {
message->m_iAuxVal = iData;
}
}
// 4J-JEV: Moved to keep data override even if we're overriding the
// icon as well.
message->m_iAuxVal =
(m_iDataOverride > -1) ? m_iDataOverride : iData;
message->m_messageId = Item::items[id]->getUseDescriptionId();
message->m_titleId =
Item::items[id]->getDescriptionId(message->m_iAuxVal);