From 0aba5c8d2d7114ce817e48c250b36100ed8f1934 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Wed, 26 Dec 2018 13:37:13 +1100 Subject: [PATCH] fix msvc builds and cleanup some warnings --- src/common/Network/GamePacketNew.h | 2 +- src/common/Network/PacketContainer.cpp | 2 +- src/world/Manager/HousingMgr.h | 1 + src/world/Territory/HousingZone.h | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/Network/GamePacketNew.h b/src/common/Network/GamePacketNew.h index 7cc943c6..0bb8a078 100644 --- a/src/common/Network/GamePacketNew.h +++ b/src/common/Network/GamePacketNew.h @@ -169,7 +169,7 @@ namespace Sapphire::Network::Packets // Set the values of static fields. // The size must be the sum of the segment header and the content - m_segHdr.size = sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) + getContentSize(); + m_segHdr.size = static_cast< uint32_t >( sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) + getContentSize() ); m_segHdr.type = getSegmentType(); } diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp index 02a42c93..a61c38c0 100644 --- a/src/common/Network/PacketContainer.cpp +++ b/src/common/Network/PacketContainer.cpp @@ -24,7 +24,7 @@ void Sapphire::Network::Packets::PacketContainer::addPacket( Sapphire::Network:: { m_entryList.push_back( entry ); - m_ipcHdr.size += entry->getSize(); + m_ipcHdr.size += static_cast< uint32_t >( entry->getSize() ); m_ipcHdr.count++; } diff --git a/src/world/Manager/HousingMgr.h b/src/world/Manager/HousingMgr.h index 8413f8e2..311b58b4 100644 --- a/src/world/Manager/HousingMgr.h +++ b/src/world/Manager/HousingMgr.h @@ -5,6 +5,7 @@ #include "Territory/HousingZone.h" #include #include +#include namespace Sapphire::Data { diff --git a/src/world/Territory/HousingZone.h b/src/world/Territory/HousingZone.h index 79b2836b..f3e88fc9 100644 --- a/src/world/Territory/HousingZone.h +++ b/src/world/Territory/HousingZone.h @@ -4,6 +4,8 @@ #include "Zone.h" #include "Forwards.h" +#include + namespace Sapphire { enum class LandPurchaseResult