Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13276 from JoshuaVandaele/sfml-3.0.0

Browse Source 
Migrate to SFML 3.0.0
This commit is contained in:
JMC47 authored and GitHub committed 2025-03-10 15:03:36 -04:00
2 parents 13d966760d 0a83783fae
commit 9f43f59c9b
60 files changed
+205 -9899
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/Core/NetPlayServer.cpp
+8 -8
View File
@@ -425,7 +425,7 @@ void NetPlayServer::ThreadFunc()
static void SendSyncIdentifier(sf::Packet& spac, const SyncIdentifier& sync_identifier)
{
// We cast here due to a potential long vs long long mismatch
spac << static_cast<sf::Uint64>(sync_identifier.dol_elf_size);
spac << static_cast<u64>(sync_identifier.dol_elf_size);
spac << sync_identifier.game_id;
spac << sync_identifier.revision;
@@ -1574,7 +1574,7 @@ bool NetPlayServer::StartGame()
m_current_golfer = 1;
m_pending_golfer = 0;
const sf::Uint64 initial_rtc = GetInitialNetPlayRTC();
const u64 initial_rtc = GetInitialNetPlayRTC();
const std::string region = Config::GetDirectoryForRegion(
Config::ToGameCubeRegion(m_dialog->FindGameFile(m_selected_game_identifier)->GetRegion()));
@@ -1851,7 +1851,7 @@ bool NetPlayServer::SyncSaveData(const SaveSyncInfo& sync_info)
// No file, so we'll say the size is 0
INFO_LOG_FMT(NETPLAY, "Sending empty marker for raw memcard {} in slot {}.", path,
is_slot_a ? 'A' : 'B');
pac << sf::Uint64{0};
pac << u64{0};
}
SendChunkedToClients(std::move(pac), 1,
@@ -1925,7 +1925,7 @@ bool NetPlayServer::SyncSaveData(const SaveSyncInfo& sync_info)
for (const auto& [title_id, storage] : sync_info.wii_saves)
{
pac << sf::Uint64{title_id};
pac << u64{title_id};
if (storage->SaveExists())
{
@@ -1942,7 +1942,7 @@ bool NetPlayServer::SyncSaveData(const SaveSyncInfo& sync_info)
pac << true; // save exists
// Header
pac << sf::Uint64{header->tid};
pac << u64{header->tid};
pac << header->banner_size << header->permissions << header->unk1;
for (u8 byte : header->md5)
pac << byte;
@@ -1956,7 +1956,7 @@ bool NetPlayServer::SyncSaveData(const SaveSyncInfo& sync_info)
<< bk_header->total_size;
for (u8 byte : bk_header->unk3)
pac << byte;
pac << sf::Uint64{bk_header->tid};
pac << u64{bk_header->tid};
for (u8 byte : bk_header->mac_address)
pac << byte;
@@ -2024,7 +2024,7 @@ bool NetPlayServer::SyncSaveData(const SaveSyncInfo& sync_info)
{
// No file, so we'll say the size is 0
INFO_LOG_FMT(NETPLAY, "Sending empty marker for GBA save at {} for slot {}.", path, i);
pac << sf::Uint64{0};
pac << u64{0};
}
SendChunkedToClients(std::move(pac), 1,
@@ -2436,7 +2436,7 @@ void NetPlayServer::ChunkedDataThreadFunc()
sf::Packet pac;
pac << MessageID::ChunkedDataStart;
pac << id << e.title << sf::Uint64{e.packet.getDataSize()};
pac << id << e.title << u64{e.packet.getDataSize()};
ChunkedDataSend(std::move(pac), e.target_pid, e.target_mode);