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:
@@ -13,13 +13,31 @@ ChatPacket::ChatPacket()
|
||||
m_messageType = e_ChatCustom;
|
||||
}
|
||||
|
||||
// Old chat packet constructor, adds message, custom data and additional message to arg vectors
|
||||
ChatPacket::ChatPacket(const wstring& message, EChatPacketMessage type /*= e_ChatCustom*/, int customData /*= -1*/, const wstring& additionalMessage /*= L""*/)
|
||||
ChatPacket::ChatPacket(const wstring& message, EChatPacketMessage type /*= e_ChatCustom*/, int customData /*= -1*/)
|
||||
{
|
||||
m_messageType = type;
|
||||
if (customData != -1) m_intArgs.push_back(customData);
|
||||
if (message != L"" || additionalMessage != L"") m_stringArgs.push_back(message);
|
||||
if (additionalMessage != L"") m_stringArgs.push_back(additionalMessage);
|
||||
|
||||
m_stringArgs.push_back(message);
|
||||
}
|
||||
|
||||
ChatPacket::ChatPacket(const wstring& message, EChatPacketMessage type, int sourceEntityType, const wstring& sourceName)
|
||||
{
|
||||
m_messageType = type;
|
||||
if (sourceEntityType != -1) m_intArgs.push_back(sourceEntityType);
|
||||
|
||||
m_stringArgs.push_back(message);
|
||||
m_stringArgs.push_back(sourceName);
|
||||
}
|
||||
|
||||
ChatPacket::ChatPacket(const wstring& message, EChatPacketMessage type, int sourceEntityType, const wstring& sourceName, const wstring& itemName)
|
||||
{
|
||||
m_messageType = type;
|
||||
if (sourceEntityType != -1) m_intArgs.push_back(sourceEntityType);
|
||||
|
||||
m_stringArgs.push_back(message);
|
||||
m_stringArgs.push_back(sourceName);
|
||||
m_stringArgs.push_back(itemName);
|
||||
}
|
||||
|
||||
// Read chat packet (throws IOException)
|
||||
@@ -56,7 +74,7 @@ void ChatPacket::write(DataOutputStream *dos)
|
||||
for(int i = 0; i < m_stringArgs.size(); i++)
|
||||
{
|
||||
writeUtf(m_stringArgs[i], dos);
|
||||
}
|
||||
}
|
||||
|
||||
for(int i = 0; i < m_intArgs.size(); i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user