mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-21 05:09:34 -06:00
Merge pull request #13276 from JoshuaVandaele/sfml-3.0.0
Migrate to SFML 3.0.0
This commit is contained in:
@ -325,7 +325,7 @@ bool NetPlayClient::Connect()
|
||||
static void ReceiveSyncIdentifier(sf::Packet& spac, SyncIdentifier& sync_identifier)
|
||||
{
|
||||
// We use a temporary variable here due to a potential long vs long long mismatch
|
||||
sf::Uint64 dol_elf_size;
|
||||
u64 dol_elf_size;
|
||||
spac >> dol_elf_size;
|
||||
sync_identifier.dol_elf_size = dol_elf_size;
|
||||
|
||||
@ -607,7 +607,7 @@ void NetPlayClient::OnChunkedDataPayload(sf::Packet& packet)
|
||||
sf::Packet progress_packet;
|
||||
progress_packet << MessageID::ChunkedDataProgress;
|
||||
progress_packet << cid;
|
||||
progress_packet << sf::Uint64{data_packet.getDataSize()};
|
||||
progress_packet << u64{data_packet.getDataSize()};
|
||||
Send(progress_packet, CHUNKED_DATA_CHANNEL);
|
||||
}
|
||||
|
||||
@ -2526,7 +2526,7 @@ void NetPlayClient::SendTimeBase()
|
||||
|
||||
if (netplay_client->m_timebase_frame % 60 == 0)
|
||||
{
|
||||
const sf::Uint64 timebase = Core::System::GetInstance().GetSystemTimers().GetFakeTimeBase();
|
||||
const u64 timebase = Core::System::GetInstance().GetSystemTimers().GetFakeTimeBase();
|
||||
|
||||
sf::Packet packet;
|
||||
packet << MessageID::TimeBase;
|
||||
|
Reference in New Issue
Block a user