mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-01 01:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SFMLHelper: Simplify 64-bit packet reading function and remove 64-bit write function

Browse Source 
Now that SFML's packet class can properly handle 64-bit values, we don't
need a helper function just to write values to the packets.
This commit is contained in:
Lioncash 2018-08-27 17:08:41 -04:00
parent 3130d388db
commit d10a0b440f
4 changed files with 15 additions and 20 deletions
Show Stats 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) u64 PacketReadU64(sf::Packet& packet)
{ {
u32 low, high; sf::Uint64 value;
packet >> low >> high; packet >> value;
return low | (static_cast<u64>(high) << 32); return value;
}
void PacketWriteU64(sf::Packet& packet, const u64 value)
{
packet << static_cast<u32>(value) << static_cast<u32>(value >> 32);
} }
} // namespace Common } // namespace Common

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

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

4
Source/Core/Core/NetPlayClient.cpp
View File

@ -1769,11 +1769,11 @@ void NetPlayClient::SendTimeBase()
if (netplay_client->m_timebase_frame % 60 == 0) if (netplay_client->m_timebase_frame % 60 == 0)
{ {
u64 timebase = SystemTimers::GetFakeTimeBase(); const sf::Uint64 timebase = SystemTimers::GetFakeTimeBase();
sf::Packet packet; sf::Packet packet;
packet << static_cast<MessageId>(NP_MSG_TIMEBASE); packet << static_cast<MessageId>(NP_MSG_TIMEBASE);
Common::PacketWriteU64(packet, timebase); packet << timebase;
packet << netplay_client->m_timebase_frame; packet << netplay_client->m_timebase_frame;
netplay_client->SendAsync(std::move(packet)); netplay_client->SendAsync(std::move(packet));

19
Source/Core/Core/NetPlayServer.cpp
View File

@ -5,6 +5,7 @@
#include "Core/NetPlayServer.h" #include "Core/NetPlayServer.h"
#include <algorithm> #include <algorithm>
#include <cinttypes>
#include <cstddef> #include <cstddef>
#include <cstdio> #include <cstdio>
#include <memory> #include <memory>
@ -989,7 +990,7 @@ bool NetPlayServer::StartGame()
m_first_pad_status_received.fill(false); m_first_pad_status_received.fill(false);
const u64 initial_rtc = GetInitialNetPlayRTC(); const sf::Uint64 initial_rtc = GetInitialNetPlayRTC();
const std::string region = SConfig::GetDirectoryForRegion( const std::string region = SConfig::GetDirectoryForRegion(
SConfig::ToGameCubeRegion(m_dialog->FindGameFile(m_selected_game)->GetRegion())); SConfig::ToGameCubeRegion(m_dialog->FindGameFile(m_selected_game)->GetRegion()));
@ -1052,7 +1053,7 @@ bool NetPlayServer::StartGame()
spac << m_settings.m_ArbitraryMipmapDetectionThreshold; spac << m_settings.m_ArbitraryMipmapDetectionThreshold;
spac << m_settings.m_EnableGPUTextureDecoding; spac << m_settings.m_EnableGPUTextureDecoding;
spac << m_settings.m_StrictSettingsSync; spac << m_settings.m_StrictSettingsSync;
Common::PacketWriteU64(spac, initial_rtc); spac << initial_rtc;
spac << m_settings.m_SyncSaveData; spac << m_settings.m_SyncSaveData;
spac << region; spac << region;
@ -1142,7 +1143,7 @@ bool NetPlayServer::SyncSaveData()
else else
{ {
// No file, so we'll say the size is 0 // No file, so we'll say the size is 0
Common::PacketWriteU64(pac, 0); pac << sf::Uint64{0};
} }
SendAsyncToClients(std::move(pac)); SendAsyncToClients(std::move(pac));
@ -1201,7 +1202,7 @@ bool NetPlayServer::SyncSaveData()
pac << true; // save exists pac << true; // save exists
// Header // Header
Common::PacketWriteU64(pac, header->tid); pac << sf::Uint64{header->tid};
pac << header->banner_size << header->permissions << header->unk1; pac << header->banner_size << header->permissions << header->unk1;
for (size_t i = 0; i < header->md5.size(); i++) for (size_t i = 0; i < header->md5.size(); i++)
pac << header->md5[i]; pac << header->md5[i];
@ -1215,7 +1216,7 @@ bool NetPlayServer::SyncSaveData()
<< bk_header->total_size; << bk_header->total_size;
for (size_t i = 0; i < bk_header->unk3.size(); i++) for (size_t i = 0; i < bk_header->unk3.size(); i++)
pac << bk_header->unk3[i]; pac << bk_header->unk3[i];
Common::PacketWriteU64(pac, bk_header->tid); pac << sf::Uint64{bk_header->tid};
for (size_t i = 0; i < bk_header->mac_address.size(); i++) for (size_t i = 0; i < bk_header->mac_address.size(); i++)
pac << bk_header->mac_address[i]; pac << bk_header->mac_address[i];
@ -1252,8 +1253,8 @@ bool NetPlayServer::CompressFileIntoPacket(const std::string& file_path, sf::Pac
return false; return false;
} }
const u64 size = file.GetSize(); const sf::Uint64 size = file.GetSize();
Common::PacketWriteU64(packet, size); packet << size;
if (size == 0) if (size == 0)
return true; return true;
@ -1314,8 +1315,8 @@ bool NetPlayServer::CompressFileIntoPacket(const std::string& file_path, sf::Pac
bool NetPlayServer::CompressBufferIntoPacket(const std::vector<u8>& in_buffer, sf::Packet& packet) bool NetPlayServer::CompressBufferIntoPacket(const std::vector<u8>& in_buffer, sf::Packet& packet)
{ {
const u64 size = in_buffer.size(); const sf::Uint64 size = in_buffer.size();
Common::PacketWriteU64(packet, size); packet << size;
if (size == 0) if (size == 0)
return true; return true;