mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-27 04:36:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

temp commit, fix warnings and errors

Browse source
This commit is contained in:
R2DLiu 2021-12-05 16:28:09 -05:00
commit 930559bbcc
4 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
View file

@ -1517,7 +1517,6 @@ void CEXISlippi::handleOnlineInputs(u8* payload)
if (isDisconnected()) if (isDisconnected())
{ {
auto status = slippi_netplay->GetSlippiConnectStatus();
m_read_queue.push_back(3); // Indicate we disconnected m_read_queue.push_back(3); // Indicate we disconnected
return; return;
} }
@ -2147,12 +2146,12 @@ void CEXISlippi::prepareOnlineMatchState()
else else
rightTeamPlayers.push_back(i); rightTeamPlayers.push_back(i);
} }
int leftTeamSize = leftTeamPlayers.size(); auto leftTeamSize = leftTeamPlayers.size();
int rightTeamSize = rightTeamPlayers.size(); auto rightTeamSize = rightTeamPlayers.size();
leftTeamPlayers.resize(4, 0); leftTeamPlayers.resize(4, 0);
rightTeamPlayers.resize(4, 0); rightTeamPlayers.resize(4, 0);
leftTeamPlayers[3] = leftTeamSize; leftTeamPlayers[3] = static_cast<u8>(leftTeamSize);
rightTeamPlayers[3] = rightTeamSize; rightTeamPlayers[3] = static_cast<u8>(rightTeamSize);
} }
// Add rng offset to output // Add rng offset to output

6
Source/Core/Core/Slippi/SlippiGameReporter.cpp
View file

@ -16,7 +16,7 @@
#include <json.hpp> #include <json.hpp>
using json = nlohmann::json; using json = nlohmann::json;
static size_t receive(char* ptr, size_t size, size_t nmemb, void* rcvBuf) inline size_t receive(char* ptr, size_t size, size_t nmemb, void* rcvBuf)
{ {
size_t len = size * nmemb; size_t len = size * nmemb;
INFO_LOG(SLIPPI_ONLINE, "[User] Received data: %d", len); INFO_LOG(SLIPPI_ONLINE, "[User] Received data: %d", len);
@ -74,9 +74,9 @@ void SlippiGameReporter::StartReport(GameReport report)
cv.notify_one(); cv.notify_one();
} }
void SlippiGameReporter::StartNewSession(std::vector<std::string> player_uids) void SlippiGameReporter::StartNewSession(std::vector<std::string> new_player_uids)
{ {
this->player_uids = player_uids; this->player_uids = new_player_uids;
gameIndex = 1; gameIndex = 1;
} }

12
Source/Core/Core/Slippi/SlippiNetplay.cpp
View file

@ -273,7 +273,7 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
ENetPacket* epac = ENetPacket* epac =
enet_packet_create(spac.getData(), spac.getDataSize(), ENET_PACKET_FLAG_UNSEQUENCED); enet_packet_create(spac.getData(), spac.getDataSize(), ENET_PACKET_FLAG_UNSEQUENCED);
int sendResult = enet_peer_send(peer, 2, epac); enet_peer_send(peer, 2, epac);
} }
break; break;
@ -391,11 +391,11 @@ void SlippiNetplayClient::writeToPacket(sf::Packet& packet, SlippiPlayerSelectio
packet << s.teamId; packet << s.teamId;
} }
void SlippiNetplayClient::WriteChatMessageToPacket(sf::Packet& packet, int messageId, u8 playerIdx) void SlippiNetplayClient::WriteChatMessageToPacket(sf::Packet& packet, int messageId, u8 player_id)
{ {
packet << static_cast<NetPlay::MessageId>(NetPlay::NP_MSG_SLIPPI_CHAT_MESSAGE); packet << static_cast<NetPlay::MessageId>(NetPlay::NP_MSG_SLIPPI_CHAT_MESSAGE);
packet << messageId; packet << messageId;
packet << playerIdx; packet << player_id;
} }
std::unique_ptr<SlippiPlayerSelections> std::unique_ptr<SlippiPlayerSelections>
@ -447,7 +447,7 @@ void SlippiNetplayClient::Send(sf::Packet& packet)
} }
ENetPacket* epac = enet_packet_create(packet.getData(), packet.getDataSize(), flags); ENetPacket* epac = enet_packet_create(packet.getData(), packet.getDataSize(), flags);
int sendResult = enet_peer_send(m_server[i], channelId, epac); enet_peer_send(m_server[i], channelId, epac);
} }
} }
@ -1038,9 +1038,9 @@ s32 SlippiNetplayClient::CalcTimeOffsetUs()
int end = bufSize - offset; int end = bufSize - offset;
int sum = 0; int sum = 0;
for (int i = offset; i < end; i++) for (int j = offset; j < end; j++)
{ {
sum += buf[i]; sum += buf[j];
} }
int count = end - offset; int count = end - offset;

2
Source/Core/Core/Slippi/SlippiNetplay.h
View file

@ -231,7 +231,7 @@ private:
extern SlippiNetplayClient* SLIPPI_NETPLAY; // singleton static pointer extern SlippiNetplayClient* SLIPPI_NETPLAY; // singleton static pointer
static bool IsOnline() inline bool IsOnline()
{ {
return SLIPPI_NETPLAY != nullptr; return SLIPPI_NETPLAY != nullptr;
} }