aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp')
-rw-r--r--Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp b/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
index 0a953a7b..c8723a84 100644
--- a/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
@@ -50,15 +50,11 @@ bool LookAtTileHint::onLookAt(int id,int iData)
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);
return m_tutorial->setMessage(this, message);