Merge pull request #10118 from lioncash/messageid

NetPlayProto: Remove lots of casts to MessageId when inserting enum values into packets
This commit is contained in:
Léo Lam
2021-10-13 02:27:52 +02:00
committed by GitHub
5 changed files with 294 additions and 299 deletions

View File

@ -3,18 +3,37 @@
#pragma once
#include <type_traits>
#include <SFML/Network/Packet.hpp>
#include "Common/CommonTypes.h"
#include "Common/Swap.h"
namespace sf
{
class Packet;
}
sf::Packet& operator>>(sf::Packet& packet, Common::BigEndianValue<u16>& data);
sf::Packet& operator>>(sf::Packet& packet, Common::BigEndianValue<u32>& data);
sf::Packet& operator>>(sf::Packet& packet, Common::BigEndianValue<u64>& data);
template <typename Enum, std::enable_if_t<std::is_enum_v<Enum>>* = nullptr>
sf::Packet& operator<<(sf::Packet& packet, Enum e)
{
using Underlying = std::underlying_type_t<Enum>;
packet << static_cast<Underlying>(e);
return packet;
}
template <typename Enum, std::enable_if_t<std::is_enum_v<Enum>>* = nullptr>
sf::Packet& operator>>(sf::Packet& packet, Enum& e)
{
using Underlying = std::underlying_type_t<Enum>;
Underlying value{};
packet >> value;
e = static_cast<Enum>(value);
return packet;
}
namespace Common
{
u64 PacketReadU64(sf::Packet& packet);