From 4a576251832a6dbf0e5623d8bdfbba2c170520d7 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Fri, 29 Oct 2021 20:31:28 +0100 Subject: [PATCH] Avoid cast warnings in network packet handling See: #307 --- src/network/core/packet.cpp | 2 +- src/network/core/udp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/core/packet.cpp b/src/network/core/packet.cpp index c3016f6a0f..747343d899 100644 --- a/src/network/core/packet.cpp +++ b/src/network/core/packet.cpp @@ -425,7 +425,7 @@ void Packet::Recv_string(std::string &buffer, StringValidationSettings settings) size_t length = ttd_strnlen((const char *)(this->buffer.data() + this->pos), this->Size() - this->pos - 1); buffer.assign((const char *)(this->buffer.data() + this->pos), length); - this->pos += (uint)length + 1; + this->pos += (PacketSize)length + 1; str_validate_inplace(buffer, settings); } diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp index 198cfc1279..5e9a66322e 100644 --- a/src/network/core/udp.cpp +++ b/src/network/core/udp.cpp @@ -217,7 +217,7 @@ void NetworkUDPSocketHandler::SendNetworkGameInfo(Packet *p, const NetworkGameIn for (c = info->grfconfig; c != nullptr; c = c->next) { if (!HasBit(c->flags, GCF_STATIC)) count++; } - p->Send_uint8(std::min(count, NETWORK_MAX_GRF_COUNT)); // Send number of GRFs + p->Send_uint8(static_cast(std::min(count, NETWORK_MAX_GRF_COUNT))); // Send number of GRFs /* Send actual GRF Identifications */ uint index = 0;