mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity

size_t warning in gamepacketnew fixed

Browse source
This commit is contained in:
mordred 2018-12-13 13:25:00 +01:00
parent 241d066bf3
commit 4df42c718b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/Network/GamePacketNew.h
View file

@ -108,7 +108,7 @@ namespace Sapphire::Network::Packets
uint16_t m_segmentType; uint16_t m_segmentType;
public: public:
virtual uint32_t getContentSize() virtual size_t getContentSize()
{ {
return 0; return 0;
}; };
@ -195,7 +195,7 @@ namespace Sapphire::Network::Packets
FFXIVIpcPacket< T, T1 >( const FFXIVARR_PACKET_RAW& rawPacket ) FFXIVIpcPacket< T, T1 >( const FFXIVARR_PACKET_RAW& rawPacket )
{ {
auto ipcHdrSize = sizeof( FFXIVARR_IPC_HEADER ); auto ipcHdrSize = sizeof( FFXIVARR_IPC_HEADER );
auto copySize = std::min< uint32_t >( sizeof( T ), rawPacket.segHdr.size - ipcHdrSize ); auto copySize = std::min< size_t >( sizeof( T ), rawPacket.segHdr.size - ipcHdrSize );
memcpy( &m_segHdr, &rawPacket.segHdr, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) ); memcpy( &m_segHdr, &rawPacket.segHdr, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
memcpy( &m_data, &rawPacket.data[ 0 ] + ipcHdrSize, copySize ); memcpy( &m_data, &rawPacket.data[ 0 ] + ipcHdrSize, copySize );
@ -204,7 +204,7 @@ namespace Sapphire::Network::Packets
m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType ); m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
} }
uint32_t getContentSize() override size_t getContentSize() override
{ {
return sizeof( FFXIVARR_IPC_HEADER ) + sizeof( T ); return sizeof( FFXIVARR_IPC_HEADER ) + sizeof( T );
} }
@ -291,7 +291,7 @@ namespace Sapphire::Network::Packets
memcpy( &m_segHdr, data, segmentHdrSize ); memcpy( &m_segHdr, data, segmentHdrSize );
} }
uint32_t getContentSize() override size_t getContentSize() override
{ {
return m_data.size(); return m_data.size();
} }