mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-02 19:56:13 +01:00
Code Issues Releases Wiki Activity

Convert most remaining C-style casts to C++-style ones (#11867)

Browse Source
This commit is contained in:
Michael Steenbeek
2020-06-07 23:18:11 +02:00
committed by GitHub
parent 7646f1b7e4
commit 9ef8d6da42
43 changed files with 126 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/network/Network.cpp
View File

@@ -1442,7 +1442,7 @@ void Network::Client_Send_AUTH(
packet->WriteString(name.c_str());
packet->WriteString(password.c_str());
packet->WriteString(pubkey.c_str());
assert(signature.size() <= (size_t)UINT32_MAX);
assert(signature.size() <= static_cast<size_t>(UINT32_MAX));
*packet << static_cast<uint32_t>(signature.size());
packet->Write(signature.data(), signature.size());
_serverConnection->AuthStatus = NETWORK_AUTH_REQUESTED;
@@ -2611,7 +2611,9 @@ void Network::Client_Handle_GAMESTATE(NetworkConnection& connection, NetworkPack
const uint8_t* data = packet.Read(dataSize);
_serverGameState.Write(data, dataSize);
log_verbose("Received Game State %.02f%%", ((float)_serverGameState.GetLength() / (float)totalSize) * 100.0f);
log_verbose(
"Received Game State %.02f%%",
(static_cast<float>(_serverGameState.GetLength()) / static_cast<float>(totalSize)) * 100.0f);
if (_serverGameState.GetLength() == totalSize)
{
@@ -2850,7 +2852,7 @@ void Network::Client_Handle_MAP([[maybe_unused]] NetworkConnection& connection,
intent.putExtra(INTENT_EXTRA_CALLBACK, []() -> void { gNetwork.Close(); });
context_open_intent(&intent);
std::memcpy(&chunk_buffer[offset], (void*)packet.Read(chunksize), chunksize);
std::memcpy(&chunk_buffer[offset], const_cast<void*>(static_cast<const void*>(packet.Read(chunksize))), chunksize);
if (offset + chunksize == size)
{
// Allow queue processing of game actions again.