feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user