Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -5,9 +5,13 @@
|
||||
|
||||
|
||||
|
||||
// UpdateGameRuleProgressPacket() default constructor
|
||||
UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket() : m_icon(0), m_auxValue(0), m_dataTag(0)
|
||||
UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket()
|
||||
{
|
||||
m_messageId = L"";
|
||||
m_icon = -1;
|
||||
m_auxValue = 0;
|
||||
m_definitionType = ConsoleGameRules::eGameRuleType_LevelRules;
|
||||
m_dataTag = 0;
|
||||
}
|
||||
|
||||
UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket(ConsoleGameRules::EGameRuleType definitionType, const wstring &messageId, int icon, int auxValue, int dataTag, void *data, int dataLength)
|
||||
@@ -31,7 +35,7 @@ UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket(ConsoleGameRules::EGa
|
||||
|
||||
void UpdateGameRuleProgressPacket::read(DataInputStream *dis) //throws IOException
|
||||
{
|
||||
m_definitionType = static_cast<ConsoleGameRules::EGameRuleType>(dis->readInt());
|
||||
m_definitionType = (ConsoleGameRules::EGameRuleType)dis->readInt();
|
||||
m_messageId = readUtf(dis,64);
|
||||
m_icon = dis->readInt();
|
||||
m_auxValue = dis->readByte();
|
||||
@@ -67,5 +71,5 @@ void UpdateGameRuleProgressPacket::handle(PacketListener *listener)
|
||||
|
||||
int UpdateGameRuleProgressPacket::getEstimatedSize()
|
||||
{
|
||||
return static_cast<int>(m_messageId.length()) + 4 + m_data.length;
|
||||
return (int)m_messageId.length() + 4 + m_data.length;
|
||||
}
|
||||
Reference in New Issue
Block a user