ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NetPlayClient: rename variables: spac -> packet

This commit is contained in:
Michael Maltese 2017-02-28 14:33:54 -08:00
parent 1834833edd
commit c277c91b29
1 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,11 +170,11 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay
bool NetPlayClient::Connect() bool NetPlayClient::Connect()
{ {
// send connect message // send connect message
sf::Packet spac; sf::Packet packet;
spac << scm_rev_git_str; packet << scm_rev_git_str;
spac << netplay_dolphin_ver; packet << netplay_dolphin_ver;
spac << m_player_name; packet << m_player_name;
Send(spac); Send(packet);
enet_host_flush(m_client); enet_host_flush(m_client);
sf::Packet rpac; sf::Packet rpac;
// TODO: make this not hang // TODO: make this not hang
@ -368,15 +368,15 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
// update gui // update gui
m_dialog->OnMsgChangeGame(m_selected_game); m_dialog->OnMsgChangeGame(m_selected_game);
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_GAME_STATUS); packet << static_cast<MessageId>(NP_MSG_GAME_STATUS);
PlayerGameStatus status = m_dialog->FindGame(m_selected_game).empty() ? PlayerGameStatus status = m_dialog->FindGame(m_selected_game).empty() ?
PlayerGameStatus::NotFound : PlayerGameStatus::NotFound :
PlayerGameStatus::Ok; PlayerGameStatus::Ok;
spac << static_cast<u32>(status); packet << static_cast<u32>(status);
Send(spac); Send(packet);
} }
break; break;
@ -445,11 +445,11 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
u32 ping_key = 0; u32 ping_key = 0;
packet >> ping_key; packet >> ping_key;
sf::Packet spac; sf::Packet packet;
spac << (MessageId)NP_MSG_PONG; packet << (MessageId)NP_MSG_PONG;
spac << ping_key; packet << ping_key;
Send(spac); Send(packet);
} }
break; break;
@ -733,57 +733,57 @@ std::vector<const Player*> NetPlayClient::GetPlayers()
// called from ---GUI--- thread // called from ---GUI--- thread
void NetPlayClient::SendChatMessage(const std::string& msg) void NetPlayClient::SendChatMessage(const std::string& msg)
{ {
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_CHAT_MESSAGE); packet << static_cast<MessageId>(NP_MSG_CHAT_MESSAGE);
spac << msg; packet << msg;
SendAsync(std::move(spac)); SendAsync(std::move(packet));
} }
// called from ---CPU--- thread // called from ---CPU--- thread
void NetPlayClient::SendPadState(const int in_game_pad, const GCPadStatus& pad) void NetPlayClient::SendPadState(const int in_game_pad, const GCPadStatus& pad)
{ {
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_PAD_DATA); packet << static_cast<MessageId>(NP_MSG_PAD_DATA);
spac << static_cast<PadMapping>(in_game_pad); packet << static_cast<PadMapping>(in_game_pad);
spac << pad.button << pad.analogA << pad.analogB << pad.stickX << pad.stickY << pad.substickX packet << pad.button << pad.analogA << pad.analogB << pad.stickX << pad.stickY << pad.substickX
<< pad.substickY << pad.triggerLeft << pad.triggerRight; << pad.substickY << pad.triggerLeft << pad.triggerRight;
SendAsync(std::move(spac)); SendAsync(std::move(packet));
} }
// called from ---CPU--- thread // called from ---CPU--- thread
void NetPlayClient::SendWiimoteState(const int in_game_pad, const NetWiimote& nw) void NetPlayClient::SendWiimoteState(const int in_game_pad, const NetWiimote& nw)
{ {
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_WIIMOTE_DATA); packet << static_cast<MessageId>(NP_MSG_WIIMOTE_DATA);
spac << static_cast<PadMapping>(in_game_pad); packet << static_cast<PadMapping>(in_game_pad);
spac << static_cast<u8>(nw.size()); packet << static_cast<u8>(nw.size());
for (auto it : nw) for (auto it : nw)
{ {
spac << it; packet << it;
} }
SendAsync(std::move(spac)); SendAsync(std::move(packet));
} }
// called from ---GUI--- thread // called from ---GUI--- thread
void NetPlayClient::SendStartGamePacket() void NetPlayClient::SendStartGamePacket()
{ {
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_START_GAME); packet << static_cast<MessageId>(NP_MSG_START_GAME);
spac << m_current_game; packet << m_current_game;
SendAsync(std::move(spac)); SendAsync(std::move(packet));
} }
// called from ---GUI--- thread // called from ---GUI--- thread
void NetPlayClient::SendStopGamePacket() void NetPlayClient::SendStopGamePacket()
{ {
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_STOP_GAME); packet << static_cast<MessageId>(NP_MSG_STOP_GAME);
SendAsync(std::move(spac)); SendAsync(std::move(packet));
} }
// called from ---GUI--- thread // called from ---GUI--- thread
@ -1193,13 +1193,13 @@ void NetPlayClient::SendTimeBase()
u64 timebase = SystemTimers::GetFakeTimeBase(); u64 timebase = SystemTimers::GetFakeTimeBase();
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_TIMEBASE); packet << static_cast<MessageId>(NP_MSG_TIMEBASE);
spac << static_cast<u32>(timebase); packet << static_cast<u32>(timebase);
spac << static_cast<u32>(timebase << 32); packet << static_cast<u32>(timebase << 32);
spac << netplay_client->m_timebase_frame++; packet << netplay_client->m_timebase_frame++;
netplay_client->SendAsync(std::move(spac)); netplay_client->SendAsync(std::move(packet));
} }
bool NetPlayClient::DoAllPlayersHaveGame() bool NetPlayClient::DoAllPlayersHaveGame()
@ -1226,27 +1226,27 @@ void NetPlayClient::ComputeMD5(const std::string& file_identifier)
if (file.empty() || !File::Exists(file)) if (file.empty() || !File::Exists(file))
{ {
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_MD5_ERROR); packet << static_cast<MessageId>(NP_MSG_MD5_ERROR);
spac << "file not found"; packet << "file not found";
Send(spac); Send(packet);
return; return;
} }
m_MD5_thread = std::thread([this, file]() { m_MD5_thread = std::thread([this, file]() {
std::string sum = MD5::MD5Sum(file, [&](int progress) { std::string sum = MD5::MD5Sum(file, [&](int progress) {
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_MD5_PROGRESS); packet << static_cast<MessageId>(NP_MSG_MD5_PROGRESS);
spac << progress; packet << progress;
Send(spac); Send(packet);
return m_should_compute_MD5; return m_should_compute_MD5;
}); });
sf::Packet spac; sf::Packet packet;
spac << static_cast<MessageId>(NP_MSG_MD5_RESULT); packet << static_cast<MessageId>(NP_MSG_MD5_RESULT);
spac << sum; packet << sum;
Send(spac); Send(packet);
}); });
m_MD5_thread.detach(); m_MD5_thread.detach();
} }