mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Replace our own integer types with standard ones

Browse Source
This commit is contained in:
Michael Steenbeek
2018-06-20 17:28:51 +02:00
parent ec3a1e575e
commit 1b08fb4e69
618 changed files with 33440 additions and 33449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/network/NetworkPacket.cpp
View File

@@ -24,16 +24,16 @@ std::unique_ptr<NetworkPacket> NetworkPacket::Duplicate(NetworkPacket &packet)
return std::make_unique<NetworkPacket>(packet);
}
uint8 * NetworkPacket::GetData()
uint8_t * NetworkPacket::GetData()
{
return &(*Data)[0];
}
sint32 NetworkPacket::GetCommand()
int32_t NetworkPacket::GetCommand()
{
if (Data->size() >= sizeof(uint32))
if (Data->size() >= sizeof(uint32_t))
{
return ByteSwapBE(*(uint32 *)(&(*Data)[0]));
return ByteSwapBE(*(uint32_t *)(&(*Data)[0]));
}
else
{
@@ -62,17 +62,17 @@ bool NetworkPacket::CommandRequiresAuth()
}
}
void NetworkPacket::Write(const uint8 * bytes, size_t size)
void NetworkPacket::Write(const uint8_t * bytes, size_t size)
{
Data->insert(Data->end(), bytes, bytes + size);
}
void NetworkPacket::WriteString(const utf8 * string)
{
Write((uint8 *)string, strlen(string) + 1);
Write((uint8_t *)string, strlen(string) + 1);
}
const uint8 * NetworkPacket::Read(size_t size)
const uint8_t * NetworkPacket::Read(size_t size)
{
if (BytesRead + size > NetworkPacket::Size)
{
@@ -80,7 +80,7 @@ const uint8 * NetworkPacket::Read(size_t size)
}
else
{
uint8 * data = &GetData()[BytesRead];
uint8_t * data = &GetData()[BytesRead];
BytesRead += size;
return data;
}