flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix build on Clang

Browse Source
This commit is contained in:
Alexander Harkness 2020-03-28 18:27:38 +00:00
parent fce548139b
commit aa9a16b0c6
No known key found for this signature in database
GPG Key ID: 5187245ADF160B76
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Protocol/Protocol_1_8.cpp
View File

@ -1630,7 +1630,7 @@ void cProtocol_1_8_0::SendWholeInventory(const cWindow & a_Window)
ASSERT(m_State == 3); // In game mode? ASSERT(m_State == 3); // In game mode?
cPacketizer Pkt(*this, pktWindowItems); cPacketizer Pkt(*this, pktWindowItems);
Pkt.WriteBEUInt8(a_Window.GetWindowID()); Pkt.WriteBEUInt8(static_cast<UInt8>(a_Window.GetWindowID()));
Pkt.WriteBEInt16(static_cast<Int16>(a_Window.GetNumSlots())); Pkt.WriteBEInt16(static_cast<Int16>(a_Window.GetNumSlots()));
cItems Slots; cItems Slots;
a_Window.GetSlots(*(m_Client->GetPlayer()), Slots); a_Window.GetSlots(*(m_Client->GetPlayer()), Slots);
@ -1649,7 +1649,7 @@ void cProtocol_1_8_0::SendWindowClose(const cWindow & a_Window)
ASSERT(m_State == 3); // In game mode? ASSERT(m_State == 3); // In game mode?
cPacketizer Pkt(*this, pktWindowClose); cPacketizer Pkt(*this, pktWindowClose);
Pkt.WriteBEUInt8(a_Window.GetWindowID()); Pkt.WriteBEUInt8(static_cast<UInt8>(a_Window.GetWindowID()));
} }
@ -1667,7 +1667,7 @@ void cProtocol_1_8_0::SendWindowOpen(const cWindow & a_Window)
} }
cPacketizer Pkt(*this, pktWindowOpen); cPacketizer Pkt(*this, pktWindowOpen);
Pkt.WriteBEUInt8(a_Window.GetWindowID()); Pkt.WriteBEUInt8(static_cast<UInt8>(a_Window.GetWindowID()));
Pkt.WriteString(a_Window.GetWindowTypeName()); Pkt.WriteString(a_Window.GetWindowTypeName());
Pkt.WriteString(Printf("{\"text\":\"%s\"}", a_Window.GetWindowTitle().c_str())); Pkt.WriteString(Printf("{\"text\":\"%s\"}", a_Window.GetWindowTitle().c_str()));
@ -1703,7 +1703,7 @@ void cProtocol_1_8_0::SendWindowProperty(const cWindow & a_Window, short a_Prope
ASSERT(m_State == 3); // In game mode? ASSERT(m_State == 3); // In game mode?
cPacketizer Pkt(*this, pktWindowProperty); cPacketizer Pkt(*this, pktWindowProperty);
Pkt.WriteBEUInt8(a_Window.GetWindowID()); Pkt.WriteBEUInt8(static_cast<UInt8>(a_Window.GetWindowID()));
Pkt.WriteBEInt16(a_Property); Pkt.WriteBEInt16(a_Property);
Pkt.WriteBEInt16(a_Value); Pkt.WriteBEInt16(a_Value);
} }

8
src/Protocol/Protocol_1_9.cpp
View File

@ -1686,7 +1686,7 @@ void cProtocol_1_9_0::SendWholeInventory(const cWindow & a_Window)
ASSERT(m_State == 3); // In game mode? ASSERT(m_State == 3); // In game mode?
cPacketizer Pkt(*this, pktWindowItems); cPacketizer Pkt(*this, pktWindowItems);
Pkt.WriteBEUInt8(a_Window.GetWindowID()); Pkt.WriteBEUInt8(static_cast<UInt8>(a_Window.GetWindowID()));
Pkt.WriteBEInt16(static_cast<Int16>(a_Window.GetNumSlots())); Pkt.WriteBEInt16(static_cast<Int16>(a_Window.GetNumSlots()));
cItems Slots; cItems Slots;
a_Window.GetSlots(*(m_Client->GetPlayer()), Slots); a_Window.GetSlots(*(m_Client->GetPlayer()), Slots);
@ -1705,7 +1705,7 @@ void cProtocol_1_9_0::SendWindowClose(const cWindow & a_Window)
ASSERT(m_State == 3); // In game mode? ASSERT(m_State == 3); // In game mode?
cPacketizer Pkt(*this, pktWindowClose); cPacketizer Pkt(*this, pktWindowClose);
Pkt.WriteBEUInt8(a_Window.GetWindowID()); Pkt.WriteBEUInt8(static_cast<UInt8>(a_Window.GetWindowID()));
} }
@ -1723,7 +1723,7 @@ void cProtocol_1_9_0::SendWindowOpen(const cWindow & a_Window)
} }
cPacketizer Pkt(*this, pktWindowOpen); cPacketizer Pkt(*this, pktWindowOpen);
Pkt.WriteBEUInt8(a_Window.GetWindowID()); Pkt.WriteBEUInt8(static_cast<UInt8>(a_Window.GetWindowID()));
Pkt.WriteString(a_Window.GetWindowTypeName()); Pkt.WriteString(a_Window.GetWindowTypeName());
Pkt.WriteString(Printf("{\"text\":\"%s\"}", a_Window.GetWindowTitle().c_str())); Pkt.WriteString(Printf("{\"text\":\"%s\"}", a_Window.GetWindowTitle().c_str()));
@ -1759,7 +1759,7 @@ void cProtocol_1_9_0::SendWindowProperty(const cWindow & a_Window, short a_Prope
ASSERT(m_State == 3); // In game mode? ASSERT(m_State == 3); // In game mode?
cPacketizer Pkt(*this, pktWindowProperty); cPacketizer Pkt(*this, pktWindowProperty);
Pkt.WriteBEUInt8(a_Window.GetWindowID()); Pkt.WriteBEUInt8(static_cast<UInt8>(a_Window.GetWindowID()));
Pkt.WriteBEInt16(a_Property); Pkt.WriteBEInt16(a_Property);
Pkt.WriteBEInt16(a_Value); Pkt.WriteBEInt16(a_Value);
} }