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

Merge pull request #7376 from lioncash/sfml

Browse Source 
Externals: Update SFML to 2.5.0
This commit is contained in:
Pierre Bourdon
2018-08-28 02:53:05 +02:00
committed by GitHub
parent df93bb8e76 d10a0b440f
commit 2033d660d2
43 changed files with 1159 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,13 +26,8 @@ u32 PacketReadU32(sf::Packet& packet)
u64 PacketReadU64(sf::Packet& packet)
{
u32 low, high;
packet >> low >> high;
return low | (static_cast<u64>(high) << 32);
}
void PacketWriteU64(sf::Packet& packet, const u64 value)
{
packet << static_cast<u32>(value) << static_cast<u32>(value >> 32);
sf::Uint64 value;
packet >> value;
return value;
}
} // namespace Common

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

@ -16,5 +16,4 @@ namespace Common
u16 PacketReadU16(sf::Packet& packet);
u32 PacketReadU32(sf::Packet& packet);
u64 PacketReadU64(sf::Packet& packet);
void PacketWriteU64(sf::Packet& packet, u64 value);
} // namespace Common