dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid cast warnings in network packet handling

Browse Source 
See: #307
This commit is contained in:
Jonathan G Rennison
2021-10-29 20:31:28 +01:00
parent 6ba53a9a68
commit 4a57625183
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/packet.cpp
View File

@@ -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); 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); 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); str_validate_inplace(buffer, settings);
} }

2
src/network/core/udp.cpp
View File

@@ -217,7 +217,7 @@ void NetworkUDPSocketHandler::SendNetworkGameInfo(Packet *p, const NetworkGameIn
for (c = info->grfconfig; c != nullptr; c = c->next) { for (c = info->grfconfig; c != nullptr; c = c->next) {
if (!HasBit(c->flags, GCF_STATIC)) count++; if (!HasBit(c->flags, GCF_STATIC)) count++;
} }
p->Send_uint8(std::min<uint>(count, NETWORK_MAX_GRF_COUNT)); // Send number of GRFs p->Send_uint8(static_cast<uint8>(std::min<uint>(count, NETWORK_MAX_GRF_COUNT))); // Send number of GRFs
/* Send actual GRF Identifications */ /* Send actual GRF Identifications */
uint index = 0; uint index = 0;