sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation errors and warnings

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-07-07 22:16:22 +02:00
parent 1f6937ab1b
commit 309fd547e1
14 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Network/AlgorithmNetwork.cpp
View File

@@ -330,7 +330,7 @@ namespace Nz
if (value > 65535) // must be 16 bit quantity
return false;
*(resultPtr++) = value >> 8;
*(resultPtr++) = static_cast<UInt8>(value >> 8);
*(resultPtr++) = value & 0xFF;
if (*addressPtr == ':') // typical case inside; carry on

12
src/Nazara/Network/ENetHost.cpp
View File

@@ -831,7 +831,7 @@ namespace Nz
command.header.channelID = acknowledgement.command.header.channelID;
command.header.reliableSequenceNumber = reliableSequenceNumber;
command.acknowledge.receivedReliableSequenceNumber = reliableSequenceNumber;
command.acknowledge.receivedSentTime = HostToNet<UInt16>(acknowledgement.sentTime);
command.acknowledge.receivedSentTime = HostToNet(UInt16(acknowledgement.sentTime));
if ((acknowledgement.command.header.command & ENetProtocolCommand_Mask) == ENetProtocolCommand_Disconnect)
peer->DispatchState(ENetPeerState::Zombie);
@@ -1219,7 +1219,7 @@ namespace Nz
void ENetHost::ThrottleBandwidth()
{
UInt32 currentTime = GetElapsedMilliseconds();
UInt32 currentTime = UInt32(GetElapsedMilliseconds());
UInt32 elapsedTime = currentTime - m_bandwidthThrottleEpoch;
if (elapsedTime < ENetConstants::ENetHost_BandwidthThrottleInterval)
@@ -1230,8 +1230,8 @@ namespace Nz
if (m_connectedPeers == 0)
return;
UInt32 dataTotal = ~0;
UInt32 bandwidth = ~0;
UInt32 dataTotal = ~UInt32(0);
UInt32 bandwidth = ~UInt32(0);
if (m_outgoingBandwidth != 0)
{
@@ -1248,8 +1248,8 @@ namespace Nz
}
UInt32 peersRemaining = m_connectedPeers;
UInt32 bandwidthLimit = ~0;
UInt32 throttle = ~0;
UInt32 bandwidthLimit = ~UInt32(0);
UInt32 throttle = ~UInt32(0);
bool needsAdjustment = m_bandwidthLimitedPeers > 0;
while (peersRemaining > 0 && needsAdjustment)

16
src/Nazara/Network/ENetPeer.cpp
View File

@@ -267,7 +267,7 @@ namespace Nz
command.sendUnreliable.dataLength = HostToNet(UInt16(packetRef->data.GetDataSize()));
}
QueueOutgoingCommand(command, packetRef, 0, packetSize);
QueueOutgoingCommand(command, packetRef, 0, UInt16(packetSize));
return true;
}
@@ -355,7 +355,7 @@ namespace Nz
channel.incomingReliableSequenceNumber = incomingCommand.reliableSequenceNumber;
if (incomingCommand.fragments.GetSize() > 0)
channel.incomingReliableSequenceNumber += incomingCommand.fragments.GetSize() - 1;
channel.incomingReliableSequenceNumber += static_cast<UInt16>(incomingCommand.fragments.GetSize() - 1);
}
if (currentCommand == channel.incomingReliableCommands.begin())
@@ -608,7 +608,7 @@ namespace Nz
ENetPeer::Channel& channel = m_channels[command->header.channelID];
UInt32 startSequenceNumber = NetToHost(command->sendFragment.startSequenceNumber);
UInt16 startWindow = startSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
UInt16 startWindow = UInt16(startSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize);
UInt16 currentWindow = channel.incomingReliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
if (startSequenceNumber < channel.incomingReliableSequenceNumber)
@@ -656,7 +656,7 @@ namespace Nz
if (!startCommand)
{
ENetProtocol hostCommand = *command;
hostCommand.header.reliableSequenceNumber = startSequenceNumber;
hostCommand.header.reliableSequenceNumber = static_cast<UInt16>(startSequenceNumber);
startCommand = QueueIncomingCommand(hostCommand, nullptr, totalLength, ENetPacketFlag_Reliable, fragmentCount);
if (!startCommand)
@@ -727,7 +727,7 @@ namespace Nz
UInt32 reliableSequenceNumber = command->header.reliableSequenceNumber;
UInt32 startSequenceNumber = NetToHost(command->sendFragment.startSequenceNumber);
UInt16 reliableWindow = reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
UInt16 reliableWindow = UInt16(reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize);
UInt16 currentWindow = channel.incomingReliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
if (startSequenceNumber < channel.incomingReliableSequenceNumber)
@@ -829,7 +829,7 @@ namespace Nz
if (unsequencedGroup - index != m_incomingUnsequencedGroup)
{
m_incomingUnsequencedGroup = unsequencedGroup - index;
m_incomingUnsequencedGroup = static_cast<UInt16>(unsequencedGroup - index);
m_unsequencedWindow.fill(0);
}
@@ -1120,7 +1120,7 @@ namespace Nz
if ((command.header.command & ENetProtocolCommand_Mask) != ENetProtocolCommand_SendUnsequenced)
{
reliableSequenceNumber = command.header.reliableSequenceNumber;
reliableWindow = reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
reliableWindow = static_cast<UInt16>(reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize);
currentWindow = channel.incomingReliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
if (reliableSequenceNumber < channel.incomingReliableSequenceNumber)
@@ -1225,7 +1225,7 @@ namespace Nz
if (m_totalWaitingData >= m_host->m_maximumWaitingData)
return nullptr;
ENetPacketRef packet = m_host->AllocatePacket(flags);
ENetPacketRef packet = m_host->AllocatePacket(ENetPacketFlags(flags));
packet->data.Reset(0, data, dataLength);
IncomingCommmand incomingCommand;

4
src/Nazara/Network/Win32/IpAddressImpl.cpp
View File

@@ -264,8 +264,8 @@ namespace Nz
for (unsigned int i = 0; i < 8; ++i)
{
u_short addressPart = htons(address[i]);
socketAddress->sin6_addr.s6_addr[i * 2 + 0] = addressPart >> 0;
socketAddress->sin6_addr.s6_addr[i * 2 + 1] = addressPart >> 8;
socketAddress->sin6_addr.s6_addr[i * 2 + 0] = static_cast<UCHAR>(addressPart >> 0);
socketAddress->sin6_addr.s6_addr[i * 2 + 1] = static_cast<UCHAR>(addressPart >> 8);
}
return sizeof(sockaddr_in6);

2
src/Nazara/Network/Win32/SocketImpl.cpp
View File

@@ -452,7 +452,7 @@ namespace Nz
#endif
}
SocketState SocketImpl::PollConnection(SocketHandle handle, const IpAddress& address, UInt64 msTimeout, SocketError* error)
SocketState SocketImpl::PollConnection(SocketHandle handle, const IpAddress& /*address*/, UInt64 msTimeout, SocketError* error)
{
// Wait until socket is available for writing or an error occurs (ie when connection succeeds or fails)
WSAPOLLFD descriptor;