piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7445 from Techjar/improve-sfmlhelper

Browse Source 
Improve SFMLHelper
This commit is contained in:
Pierre Bourdon
2018-10-28 23:53:59 +01:00
committed by GitHub
parent 1cb0900a10 c5b4e1a5f6
commit 53a45e5c28
3 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/Common/SFMLHelper.cpp
View File

@ -6,24 +6,34 @@
#include <SFML/Network/Packet.hpp>
namespace Common
{
// This only exists as a helper for BigEndianValue
u16 PacketReadU16(sf::Packet& packet)
sf::Packet& operator>>(sf::Packet& packet, Common::BigEndianValue<u16>& data)
{
u16 tmp;
packet >> tmp;
return tmp;
data = tmp;
return packet;
}
// This only exists as a helper for BigEndianValue
u32 PacketReadU32(sf::Packet& packet)
sf::Packet& operator>>(sf::Packet& packet, Common::BigEndianValue<u32>& data)
{
u32 tmp;
packet >> tmp;
return tmp;
data = tmp;
return packet;
}
sf::Packet& operator>>(sf::Packet& packet, Common::BigEndianValue<u64>& data)
{
sf::Uint64 tmp;
packet >> tmp;
data = tmp;
return packet;
}
namespace Common
{
// SFML's Uint64 type is different depending on platform,
// so we have this for cleaner code.
u64 PacketReadU64(sf::Packet& packet)
{
sf::Uint64 value;

7
Source/Core/Common/SFMLHelper.h
View File

@ -5,15 +5,18 @@
#pragma once
#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);
namespace Common
{
u16 PacketReadU16(sf::Packet& packet);
u32 PacketReadU32(sf::Packet& packet);
u64 PacketReadU64(sf::Packet& packet);
} // namespace Common