diff options
Diffstat (limited to 'game/shared')
| -rw-r--r-- | game/shared/protocol.cc | 299 | ||||
| -rw-r--r-- | game/shared/world/voxel_storage.cc | 8 |
2 files changed, 162 insertions, 145 deletions
diff --git a/game/shared/protocol.cc b/game/shared/protocol.cc index 3af891d..f8a9ba8 100644 --- a/game/shared/protocol.cc +++ b/game/shared/protocol.cc @@ -3,7 +3,6 @@ #include "shared/protocol.hh" #include "core/io/buffer.hh" -#include "core/math/floathacks.hh" #include "shared/entity/head.hh" #include "shared/entity/player.hh" @@ -20,59 +19,59 @@ static io::WriteBuffer write_buffer; ENetPacket* protocol::encode(const protocol::StatusRequest& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::StatusRequest::ID); - write_buffer.write_UI32(packet.version); + write_buffer.write<std::uint16_t>(protocol::StatusRequest::ID); + write_buffer.write<std::uint32_t>(packet.version); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::StatusResponse& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::StatusResponse::ID); - write_buffer.write_UI32(packet.version); - write_buffer.write_UI16(packet.max_players); - write_buffer.write_UI16(packet.num_players); - write_buffer.write_string(packet.motd); + write_buffer.write<std::uint16_t>(protocol::StatusResponse::ID); + write_buffer.write<std::uint32_t>(packet.version); + write_buffer.write<std::uint16_t>(packet.max_players); + write_buffer.write<std::uint16_t>(packet.num_players); + write_buffer.write<std::string_view>(packet.motd); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::LoginRequest& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::LoginRequest::ID); - write_buffer.write_UI32(packet.version); - write_buffer.write_UI64(packet.voxel_registry_checksum); - write_buffer.write_UI64(packet.item_registry_checksum); - write_buffer.write_UI64(packet.password_hash); - write_buffer.write_string(packet.username.substr(0, protocol::MAX_USERNAME)); + write_buffer.write<std::uint16_t>(protocol::LoginRequest::ID); + write_buffer.write<std::uint32_t>(packet.version); + write_buffer.write<std::uint64_t>(packet.voxel_registry_checksum); + write_buffer.write<std::uint64_t>(packet.item_registry_checksum); + write_buffer.write<std::uint64_t>(packet.password_hash); + write_buffer.write<std::string_view>(packet.username.substr(0, protocol::MAX_USERNAME)); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::LoginResponse& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::LoginResponse::ID); - write_buffer.write_UI16(packet.client_index); - write_buffer.write_UI64(packet.client_identity); - write_buffer.write_UI16(packet.server_tickrate); + write_buffer.write<std::uint16_t>(protocol::LoginResponse::ID); + write_buffer.write<std::uint16_t>(packet.client_index); + write_buffer.write<std::uint64_t>(packet.client_identity); + write_buffer.write<std::uint16_t>(packet.server_tickrate); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::Disconnect& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::Disconnect::ID); - write_buffer.write_string(packet.reason); + write_buffer.write<std::uint16_t>(protocol::Disconnect::ID); + write_buffer.write<std::string_view>(packet.reason); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::ChunkVoxels& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::ChunkVoxels::ID); - write_buffer.write_I32(packet.chunk.x); - write_buffer.write_I32(packet.chunk.y); - write_buffer.write_I32(packet.chunk.z); + write_buffer.write<std::uint16_t>(protocol::ChunkVoxels::ID); + write_buffer.write<std::int32_t>(packet.chunk.x); + write_buffer.write<std::int32_t>(packet.chunk.y); + write_buffer.write<std::int32_t>(packet.chunk.z); packet.voxels.serialize(write_buffer); return write_buffer.to_packet(flags); } @@ -80,135 +79,135 @@ ENetPacket* protocol::encode(const protocol::ChunkVoxels& packet, enet_uint32 fl ENetPacket* protocol::encode(const protocol::EntityTransform& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::EntityTransform::ID); - write_buffer.write_UI64(static_cast<std::uint64_t>(packet.entity)); - write_buffer.write_I32(packet.chunk.x); - write_buffer.write_I32(packet.chunk.y); - write_buffer.write_I32(packet.chunk.z); - write_buffer.write_FP32(packet.local.x); - write_buffer.write_FP32(packet.local.y); - write_buffer.write_FP32(packet.local.z); - write_buffer.write_FP32(packet.angles.x); - write_buffer.write_FP32(packet.angles.y); - write_buffer.write_FP32(packet.angles.z); + write_buffer.write<std::uint16_t>(protocol::EntityTransform::ID); + write_buffer.write<std::uint64_t>(static_cast<std::uint64_t>(packet.entity)); + write_buffer.write<std::int32_t>(packet.chunk.x); + write_buffer.write<std::int32_t>(packet.chunk.y); + write_buffer.write<std::int32_t>(packet.chunk.z); + write_buffer.write<float>(packet.local.x); + write_buffer.write<float>(packet.local.y); + write_buffer.write<float>(packet.local.z); + write_buffer.write<float>(packet.angles.x); + write_buffer.write<float>(packet.angles.y); + write_buffer.write<float>(packet.angles.z); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::EntityHead& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::EntityHead::ID); - write_buffer.write_UI64(static_cast<std::uint64_t>(packet.entity)); - write_buffer.write_FP32(packet.angles.x); - write_buffer.write_FP32(packet.angles.y); - write_buffer.write_FP32(packet.angles.z); + write_buffer.write<std::uint16_t>(protocol::EntityHead::ID); + write_buffer.write<std::uint64_t>(static_cast<std::uint64_t>(packet.entity)); + write_buffer.write<float>(packet.angles.x); + write_buffer.write<float>(packet.angles.y); + write_buffer.write<float>(packet.angles.z); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::EntityVelocity& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::EntityVelocity::ID); - write_buffer.write_UI64(static_cast<std::uint64_t>(packet.entity)); - write_buffer.write_FP32(packet.value.x); - write_buffer.write_FP32(packet.value.y); - write_buffer.write_FP32(packet.value.z); + write_buffer.write<std::uint16_t>(protocol::EntityVelocity::ID); + write_buffer.write<std::uint64_t>(static_cast<std::uint64_t>(packet.entity)); + write_buffer.write<float>(packet.value.x); + write_buffer.write<float>(packet.value.y); + write_buffer.write<float>(packet.value.z); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::SpawnPlayer& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::SpawnPlayer::ID); - write_buffer.write_UI64(static_cast<std::uint64_t>(packet.entity)); + write_buffer.write<std::uint16_t>(protocol::SpawnPlayer::ID); + write_buffer.write<std::uint64_t>(static_cast<std::uint64_t>(packet.entity)); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::ChatMessage& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::ChatMessage::ID); - write_buffer.write_UI16(packet.type); - write_buffer.write_string(packet.sender.substr(0, protocol::MAX_USERNAME)); - write_buffer.write_string(packet.message.substr(0, protocol::MAX_CHAT)); + write_buffer.write<std::uint16_t>(protocol::ChatMessage::ID); + write_buffer.write<std::uint16_t>(packet.type); + write_buffer.write<std::string_view>(packet.sender.substr(0, protocol::MAX_USERNAME)); + write_buffer.write<std::string_view>(packet.message.substr(0, protocol::MAX_CHAT)); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::SetVoxel& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::SetVoxel::ID); - write_buffer.write_I64(packet.vpos.x); - write_buffer.write_I64(packet.vpos.y); - write_buffer.write_I64(packet.vpos.z); - write_buffer.write_UI16(packet.voxel); - write_buffer.write_UI16(packet.flags); + write_buffer.write<std::uint16_t>(protocol::SetVoxel::ID); + write_buffer.write<std::int64_t>(packet.vpos.x); + write_buffer.write<std::int64_t>(packet.vpos.y); + write_buffer.write<std::int64_t>(packet.vpos.z); + write_buffer.write<std::uint16_t>(packet.voxel); + write_buffer.write<std::uint16_t>(packet.flags); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::RemoveEntity& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::RemoveEntity::ID); - write_buffer.write_UI64(static_cast<std::uint64_t>(packet.entity)); + write_buffer.write<std::uint16_t>(protocol::RemoveEntity::ID); + write_buffer.write<std::uint64_t>(static_cast<std::uint64_t>(packet.entity)); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::EntityPlayer& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::EntityPlayer::ID); - write_buffer.write_UI64(static_cast<std::uint64_t>(packet.entity)); + write_buffer.write<std::uint16_t>(protocol::EntityPlayer::ID); + write_buffer.write<std::uint64_t>(static_cast<std::uint64_t>(packet.entity)); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::ScoreboardUpdate& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::ScoreboardUpdate::ID); - write_buffer.write_UI16(static_cast<std::uint16_t>(packet.names.size())); + write_buffer.write<std::uint16_t>(protocol::ScoreboardUpdate::ID); + write_buffer.write<std::uint16_t>(static_cast<std::uint16_t>(packet.names.size())); for(const std::string& username : packet.names) - write_buffer.write_string(username.substr(0, protocol::MAX_USERNAME)); + write_buffer.write<std::string_view>(username.substr(0, protocol::MAX_USERNAME)); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::RequestChunk& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::RequestChunk::ID); - write_buffer.write_I32(packet.cpos.x); - write_buffer.write_I32(packet.cpos.y); - write_buffer.write_I32(packet.cpos.z); + write_buffer.write<std::uint16_t>(protocol::RequestChunk::ID); + write_buffer.write<std::int32_t>(packet.cpos.x); + write_buffer.write<std::int32_t>(packet.cpos.y); + write_buffer.write<std::int32_t>(packet.cpos.z); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::GenericSound& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::GenericSound::ID); - write_buffer.write_string(packet.sound.substr(0, protocol::MAX_SOUNDNAME)); - write_buffer.write_UI8(packet.looping); - write_buffer.write_FP32(packet.pitch); + write_buffer.write<std::uint16_t>(protocol::GenericSound::ID); + write_buffer.write<std::string_view>(packet.sound.substr(0, protocol::MAX_SOUNDNAME)); + write_buffer.write<std::uint8_t>(packet.looping); + write_buffer.write<float>(packet.pitch); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::EntitySound& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::EntitySound::ID); - write_buffer.write_UI64(static_cast<std::uint64_t>(packet.entity)); - write_buffer.write_string(packet.sound.substr(0, protocol::MAX_SOUNDNAME)); - write_buffer.write_UI8(packet.looping); - write_buffer.write_FP32(packet.pitch); + write_buffer.write<std::uint16_t>(protocol::EntitySound::ID); + write_buffer.write<std::uint64_t>(static_cast<std::uint64_t>(packet.entity)); + write_buffer.write<std::string_view>(packet.sound.substr(0, protocol::MAX_SOUNDNAME)); + write_buffer.write<std::uint8_t>(packet.looping); + write_buffer.write<float>(packet.pitch); return write_buffer.to_packet(flags); } ENetPacket* protocol::encode(const protocol::DimensionInfo& packet, enet_uint32 flags) { write_buffer.reset(); - write_buffer.write_UI16(protocol::DimensionInfo::ID); - write_buffer.write_string(packet.name); - write_buffer.write_FP32(packet.gravity); + write_buffer.write<std::uint16_t>(protocol::DimensionInfo::ID); + write_buffer.write<std::string_view>(packet.name); + write_buffer.write<float>(packet.gravity); return write_buffer.to_packet(flags); } @@ -263,145 +262,163 @@ void protocol::decode(entt::dispatcher& dispatcher, const ENetPacket* packet, EN protocol::EntitySound entity_sound; protocol::DimensionInfo dimension_info; - auto id = read_buffer.read_UI16(); + auto id = read_buffer.read<std::uint16_t>(); switch(id) { case protocol::StatusRequest::ID: status_request.peer = peer; - status_request.version = read_buffer.read_UI32(); + status_request.version = read_buffer.read<std::uint32_t>(); dispatcher.trigger(status_request); break; + case protocol::StatusResponse::ID: status_response.peer = peer; - status_response.version = read_buffer.read_UI32(); - status_response.max_players = read_buffer.read_UI16(); - status_response.num_players = read_buffer.read_UI16(); - status_response.motd = read_buffer.read_string(); + status_response.version = read_buffer.read<std::uint32_t>(); + status_response.max_players = read_buffer.read<std::uint16_t>(); + status_response.num_players = read_buffer.read<std::uint16_t>(); + status_response.motd = read_buffer.read<std::string>(); dispatcher.trigger(status_response); break; + case protocol::LoginRequest::ID: login_request.peer = peer; - login_request.version = read_buffer.read_UI32(); - login_request.voxel_registry_checksum = read_buffer.read_UI64(); - login_request.item_registry_checksum = read_buffer.read_UI64(); - login_request.password_hash = read_buffer.read_UI64(); - login_request.username = read_buffer.read_string(); + login_request.version = read_buffer.read<std::uint32_t>(); + login_request.voxel_registry_checksum = read_buffer.read<std::uint64_t>(); + login_request.item_registry_checksum = read_buffer.read<std::uint64_t>(); + login_request.password_hash = read_buffer.read<std::uint64_t>(); + login_request.username = read_buffer.read<std::string>(); dispatcher.trigger(login_request); break; + case protocol::LoginResponse::ID: login_response.peer = peer; - login_response.client_index = read_buffer.read_UI16(); - login_response.client_identity = read_buffer.read_UI64(); - login_response.server_tickrate = read_buffer.read_UI16(); + login_response.client_index = read_buffer.read<std::uint16_t>(); + login_response.client_identity = read_buffer.read<std::uint64_t>(); + login_response.server_tickrate = read_buffer.read<std::uint16_t>(); dispatcher.trigger(login_response); break; + case protocol::Disconnect::ID: disconnect.peer = peer; - disconnect.reason = read_buffer.read_string(); + disconnect.reason = read_buffer.read<std::string>(); dispatcher.trigger(disconnect); break; + case protocol::ChunkVoxels::ID: chunk_voxels.peer = peer; - chunk_voxels.chunk.x = read_buffer.read_I32(); - chunk_voxels.chunk.y = read_buffer.read_I32(); - chunk_voxels.chunk.z = read_buffer.read_I32(); + chunk_voxels.chunk.x = read_buffer.read<std::int32_t>(); + chunk_voxels.chunk.y = read_buffer.read<std::int32_t>(); + chunk_voxels.chunk.z = read_buffer.read<std::int32_t>(); chunk_voxels.voxels.deserialize(read_buffer); dispatcher.trigger(chunk_voxels); break; + case protocol::EntityTransform::ID: entity_transform.peer = peer; - entity_transform.entity = static_cast<entt::entity>(read_buffer.read_UI64()); - entity_transform.chunk.x = read_buffer.read_I32(); - entity_transform.chunk.y = read_buffer.read_I32(); - entity_transform.chunk.z = read_buffer.read_I32(); - entity_transform.local.x = read_buffer.read_FP32(); - entity_transform.local.y = read_buffer.read_FP32(); - entity_transform.local.z = read_buffer.read_FP32(); - entity_transform.angles.x = read_buffer.read_FP32(); - entity_transform.angles.y = read_buffer.read_FP32(); - entity_transform.angles.z = read_buffer.read_FP32(); + entity_transform.entity = static_cast<entt::entity>(read_buffer.read<std::uint64_t>()); + entity_transform.chunk.x = read_buffer.read<std::int32_t>(); + entity_transform.chunk.y = read_buffer.read<std::int32_t>(); + entity_transform.chunk.z = read_buffer.read<std::int32_t>(); + entity_transform.local.x = read_buffer.read<float>(); + entity_transform.local.y = read_buffer.read<float>(); + entity_transform.local.z = read_buffer.read<float>(); + entity_transform.angles.x = read_buffer.read<float>(); + entity_transform.angles.y = read_buffer.read<float>(); + entity_transform.angles.z = read_buffer.read<float>(); dispatcher.trigger(entity_transform); break; + case protocol::EntityHead::ID: entity_head.peer = peer; - entity_head.entity = static_cast<entt::entity>(read_buffer.read_UI64()); - entity_head.angles[0] = read_buffer.read_FP32(); - entity_head.angles[1] = read_buffer.read_FP32(); - entity_head.angles[2] = read_buffer.read_FP32(); + entity_head.entity = static_cast<entt::entity>(read_buffer.read<std::uint64_t>()); + entity_head.angles[0] = read_buffer.read<float>(); + entity_head.angles[1] = read_buffer.read<float>(); + entity_head.angles[2] = read_buffer.read<float>(); dispatcher.trigger(entity_head); break; + case protocol::EntityVelocity::ID: entity_velocity.peer = peer; - entity_velocity.entity = static_cast<entt::entity>(read_buffer.read_UI64()); - entity_velocity.value.x = read_buffer.read_FP32(); - entity_velocity.value.y = read_buffer.read_FP32(); - entity_velocity.value.z = read_buffer.read_FP32(); + entity_velocity.entity = static_cast<entt::entity>(read_buffer.read<std::uint64_t>()); + entity_velocity.value.x = read_buffer.read<float>(); + entity_velocity.value.y = read_buffer.read<float>(); + entity_velocity.value.z = read_buffer.read<float>(); dispatcher.trigger(entity_velocity); break; + case protocol::SpawnPlayer::ID: spawn_player.peer = peer; - spawn_player.entity = static_cast<entt::entity>(read_buffer.read_UI64()); + spawn_player.entity = static_cast<entt::entity>(read_buffer.read<std::uint64_t>()); dispatcher.trigger(spawn_player); break; + case protocol::ChatMessage::ID: chat_message.peer = peer; - chat_message.type = read_buffer.read_UI16(); - chat_message.sender = read_buffer.read_string(); - chat_message.message = read_buffer.read_string(); + chat_message.type = read_buffer.read<std::uint16_t>(); + chat_message.sender = read_buffer.read<std::string>(); + chat_message.message = read_buffer.read<std::string>(); dispatcher.trigger(chat_message); break; + case protocol::SetVoxel::ID: set_voxel.peer = peer; - set_voxel.vpos.x = read_buffer.read_I64(); - set_voxel.vpos.y = read_buffer.read_I64(); - set_voxel.vpos.z = read_buffer.read_I64(); - set_voxel.voxel = read_buffer.read_UI16(); - set_voxel.flags = read_buffer.read_UI16(); + set_voxel.vpos.x = read_buffer.read<std::int64_t>(); + set_voxel.vpos.y = read_buffer.read<std::int64_t>(); + set_voxel.vpos.z = read_buffer.read<std::int64_t>(); + set_voxel.voxel = read_buffer.read<std::uint16_t>(); + set_voxel.flags = read_buffer.read<std::uint16_t>(); dispatcher.trigger(set_voxel); break; + case protocol::RemoveEntity::ID: remove_entity.peer = peer; - remove_entity.entity = static_cast<entt::entity>(read_buffer.read_UI64()); + remove_entity.entity = static_cast<entt::entity>(read_buffer.read<std::uint64_t>()); dispatcher.trigger(remove_entity); break; + case protocol::EntityPlayer::ID: entity_player.peer = peer; - entity_player.entity = static_cast<entt::entity>(read_buffer.read_UI64()); + entity_player.entity = static_cast<entt::entity>(read_buffer.read<std::uint64_t>()); dispatcher.trigger(entity_player); break; + case protocol::ScoreboardUpdate::ID: scoreboard_update.peer = peer; - scoreboard_update.names.resize(read_buffer.read_UI16()); + scoreboard_update.names.resize(read_buffer.read<std::uint16_t>()); for(std::size_t i = 0; i < scoreboard_update.names.size(); ++i) - scoreboard_update.names[i] = read_buffer.read_string(); + scoreboard_update.names[i] = read_buffer.read<std::string>(); dispatcher.trigger(scoreboard_update); break; + case protocol::RequestChunk::ID: request_chunk.peer = peer; - request_chunk.cpos.x = read_buffer.read_UI32(); - request_chunk.cpos.y = read_buffer.read_UI32(); - request_chunk.cpos.z = read_buffer.read_UI32(); + request_chunk.cpos.x = read_buffer.read<std::uint32_t>(); + request_chunk.cpos.y = read_buffer.read<std::uint32_t>(); + request_chunk.cpos.z = read_buffer.read<std::uint32_t>(); dispatcher.trigger(request_chunk); break; + case protocol::GenericSound::ID: generic_sound.peer = peer; - generic_sound.sound = read_buffer.read_string(); - generic_sound.looping = read_buffer.read_UI8(); - generic_sound.pitch = read_buffer.read_FP32(); + generic_sound.sound = read_buffer.read<std::string>(); + generic_sound.looping = read_buffer.read<std::uint8_t>(); + generic_sound.pitch = read_buffer.read<float>(); dispatcher.trigger(generic_sound); break; + case protocol::EntitySound::ID: entity_sound.peer = peer; - entity_sound.entity = static_cast<entt::entity>(read_buffer.read_UI64()); - entity_sound.sound = read_buffer.read_string(); - entity_sound.looping = read_buffer.read_UI8(); - entity_sound.pitch = read_buffer.read_FP32(); + entity_sound.entity = static_cast<entt::entity>(read_buffer.read<std::uint64_t>()); + entity_sound.sound = read_buffer.read<std::string>(); + entity_sound.looping = read_buffer.read<std::uint8_t>(); + entity_sound.pitch = read_buffer.read<float>(); dispatcher.trigger(entity_sound); break; + case protocol::DimensionInfo::ID: dimension_info.peer = peer; - dimension_info.name = read_buffer.read_string(); - dimension_info.gravity = read_buffer.read_FP32(); + dimension_info.name = read_buffer.read<std::string>(); + dimension_info.gravity = read_buffer.read<float>(); dispatcher.trigger(dimension_info); break; } diff --git a/game/shared/world/voxel_storage.cc b/game/shared/world/voxel_storage.cc index e28c34f..68e261c 100644 --- a/game/shared/world/voxel_storage.cc +++ b/game/shared/world/voxel_storage.cc @@ -20,10 +20,10 @@ void world::VoxelStorage::serialize(io::WriteBuffer& buffer) const mz_compress(zdata.data(), &bound, reinterpret_cast<unsigned char*>(net_storage.data()), sizeof(VoxelStorage)); - buffer.write_UI64(bound); + buffer.write<std::uint64_t>(bound); // Write all the compressed data into the buffer - for(std::size_t i = 0; i < bound; buffer.write_UI8(zdata[i++])) { + for(std::size_t i = 0; i < bound; buffer.write<std::uint8_t>(zdata[i++])) { // empty } } @@ -31,11 +31,11 @@ void world::VoxelStorage::serialize(io::WriteBuffer& buffer) const void world::VoxelStorage::deserialize(io::ReadBuffer& buffer) { auto size = static_cast<mz_ulong>(sizeof(VoxelStorage)); - auto bound = static_cast<mz_ulong>(buffer.read_UI64()); + auto bound = static_cast<mz_ulong>(buffer.read<std::uint64_t>()); auto zdata = std::vector<unsigned char>(bound); // Read all the compressed data from the buffer - for(std::size_t i = 0; i < bound; zdata[i++] = buffer.read_UI8()) { + for(std::size_t i = 0; i < bound; zdata[i++] = buffer.read<std::uint8_t>()) { // empty } |