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

fix compile

Browse source
This commit is contained in:
R2DLiu 2023-06-22 05:54:16 -04:00
commit 645d77a5d4
4 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -259,10 +259,10 @@ CEXISlippi::~CEXISlippi()
// indicate to server that this client has abandoned. Anyone trying to modify // indicate to server that this client has abandoned. Anyone trying to modify
// this behavior to game their rating is subject to get banned. // this behavior to game their rating is subject to get banned.
auto active_match_id = matchmaking->GetMatchmakeResult().id; auto active_match_id = matchmaking->GetMatchmakeResult().id;
if (activeMatchId.find("mode.ranked") != std::string::npos) if (active_match_id.find("mode.ranked") != std::string::npos)
{ {
ERROR_LOG(SLIPPI_ONLINE, "Exit during in-progress ranked game: %s", activeMatchId.c_str()); ERROR_LOG_FMT(SLIPPI_ONLINE, "Exit during in-progress ranked game: {}", active_match_id);
gameReporter->ReportAbandonment(activeMatchId); game_reporter->ReportAbandonment(active_match_id);
} }
handleConnectionCleanup(); handleConnectionCleanup();
@ -1872,9 +1872,9 @@ void CEXISlippi::prepareOpponentInputs(s32 frame, bool shouldSkip)
results[i] = slippi_netplay->GetSlippiRemotePad(i, ROLLBACK_MAX_FRAMES); results[i] = slippi_netplay->GetSlippiRemotePad(i, ROLLBACK_MAX_FRAMES);
// results[i] = slippi_netplay->GetFakePadOutput(frame); // results[i] = slippi_netplay->GetFakePadOutput(frame);
// INFO_LOG(SLIPPI_ONLINE, "Sending checksum values: [%d] %08x", results[i]->checksumFrame, // INFO_LOG(SLIPPI_ONLINE, "Sending checksum values: [%d] %08x", results[i]->checksum_frame,
// results[i]->checksum); // results[i]->checksum);
appendWordToBuffer(&m_read_queue, static_cast<u32>(results[i]->checksumFrame)); appendWordToBuffer(&m_read_queue, static_cast<u32>(results[i]->checksum_frame));
appendWordToBuffer(&m_read_queue, results[i]->checksum); appendWordToBuffer(&m_read_queue, results[i]->checksum);
} }
for (int i = remotePlayerCount; i < SLIPPI_REMOTE_PLAYER_MAX; i++) for (int i = remotePlayerCount; i < SLIPPI_REMOTE_PLAYER_MAX; i++)
@ -1895,11 +1895,11 @@ void CEXISlippi::prepareOpponentInputs(s32 frame, bool shouldSkip)
// results[i] = slippi_netplay->GetFakePadOutput(frame); // results[i] = slippi_netplay->GetFakePadOutput(frame);
// determine offset from which to copy data // determine offset from which to copy data
offset[i] = (results[i]->latestFrame - frame) * SLIPPI_PAD_FULL_SIZE; offset[i] = (results[i]->latest_frame - frame) * SLIPPI_PAD_FULL_SIZE;
offset[i] = offset[i] < 0 ? 0 : offset[i]; offset[i] = offset[i] < 0 ? 0 : offset[i];
// add latest frame we are transfering to begining of return buf // add latest frame we are transfering to begining of return buf
int32_t latestFrame = results[i]->latestFrame; int32_t latestFrame = results[i]->latest_frame;
if (latestFrame > frame) if (latestFrame > frame)
latestFrame = frame; latestFrame = frame;
latestFrameRead[i] = latestFrame; latestFrameRead[i] = latestFrame;
@ -2727,21 +2727,21 @@ void CEXISlippi::prepareOnlineMatchState()
std::vector<std::string> opponentNames = {}; std::vector<std::string> opponentNames = {};
if (matchmaking->RemotePlayerCount() == 1) if (matchmaking->RemotePlayerCount() == 1)
{ {
opponentNames.push_back(matchmaking->GetPlayerName(remotePlayerIndex)); opponentNames.push_back(matchmaking->GetPlayerName(m_remote_player_index));
} }
else else
{ {
int teamIdx = onlineMatchBlock[0x69 + localPlayerIndex * 0x24]; int teamIdx = onlineMatchBlock[0x69 + m_local_player_index * 0x24];
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
if (localPlayerIndex == i || onlineMatchBlock[0x69 + i * 0x24] == teamIdx) if (m_local_player_index == i || onlineMatchBlock[0x69 + i * 0x24] == teamIdx)
continue; continue;
opponentNames.push_back(matchmaking->GetPlayerName(i)); opponentNames.push_back(matchmaking->GetPlayerName(i));
} }
} }
auto numOpponents = opponentNames.size() == 0 ? 1 : opponentNames.size(); int numOpponents = opponentNames.size() == 0 ? 1 : static_cast<int>(opponentNames.size());
auto charsPerName = (MAX_NAME_LENGTH - (numOpponents - 1)) / numOpponents; auto charsPerName = (MAX_NAME_LENGTH - (numOpponents - 1)) / numOpponents;
std::string oppText = ""; std::string oppText = "";
for (auto& name : opponentNames) for (auto& name : opponentNames)
@ -3143,8 +3143,8 @@ void CEXISlippi::handleReportGame(const SlippiExiTypes::ReportGameQuery& query)
ERROR_LOG_FMT(SLIPPI_ONLINE, ERROR_LOG_FMT(SLIPPI_ONLINE,
"Mode: {} / {}, Frames: {}, GameIdx: {}, TiebreakIdx: {}, WinnerIdx: {}, " "Mode: {} / {}, Frames: {}, GameIdx: {}, TiebreakIdx: {}, WinnerIdx: {}, "
"StageId: {}, GameEndMethod: {}, LRASInitiator: {}", "StageId: {}, GameEndMethod: {}, LRASInitiator: {}",
r.mode, query.mode, r.duration_frames, r.game_index, r.tiebreak_index, r.winner_idx, static_cast<u8>(r.mode), query.mode, r.duration_frames, r.game_index,
r.stage_id, r.game_end_method, r.lras_initiator); r.tiebreak_index, r.winner_idx, r.stage_id, r.game_end_method, r.lras_initiator);
auto mm_players = recentMmResult.players; auto mm_players = recentMmResult.players;

11
Source/Core/Core/Slippi/SlippiExiTypes.h
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Common/CommonTypes.h" #include <Common/CommonTypes.h>
#include <Common/Swap.h>
#define REPORT_PLAYER_COUNT 4 #define REPORT_PLAYER_COUNT 4
@ -86,13 +87,13 @@ template <>
inline ReportGameQuery Convert(u8* payload) inline ReportGameQuery Convert(u8* payload)
{ {
auto q = *reinterpret_cast<ReportGameQuery*>(payload); auto q = *reinterpret_cast<ReportGameQuery*>(payload);
q.frameLength = Common::FromBigEndian(q.frameLength); q.frame_length = Common::FromBigEndian(q.frame_length);
q.gameIndex = Common::FromBigEndian(q.gameIndex); q.game_index = Common::FromBigEndian(q.game_index);
q.tiebreakIndex = Common::FromBigEndian(q.tiebreakIndex); q.tiebreak_index = Common::FromBigEndian(q.tiebreak_index);
for (int i = 0; i < REPORT_PLAYER_COUNT; i++) for (int i = 0; i < REPORT_PLAYER_COUNT; i++)
{ {
auto* p = &q.players[i]; auto* p = &q.players[i];
p->damageDone = Common::FromBigEndian(p->damageDone); p->damage_done = Common::FromBigEndian(p->damage_done);
} }
return q; return q;
} }

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

@ -171,6 +171,7 @@ void SlippiGameReporter::ReportAbandonment(std::string match_id)
if (res != 0) if (res != 0)
{ {
ERROR_LOG_FMT(SLIPPI_ONLINE, ERROR_LOG_FMT(SLIPPI_ONLINE,
"[GameReport] Got error executing abandonment request. Err code: {}", res); "[GameReport] Got error executing abandonment request. Err code: {}",
static_cast<u8>(res));
} }
} }

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

@ -306,7 +306,7 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
s64 frame64 = static_cast<s64>(frame); s64 frame64 = static_cast<s64>(frame);
s32 headFrame = remotePadQueue[pIdx].empty() ? 0 : remotePadQueue[pIdx].front()->frame; s32 headFrame = remotePadQueue[pIdx].empty() ? 0 : remotePadQueue[pIdx].front()->frame;
s64 inputs_to_copy = frame64 - static_cast<s64>(headFrame); inputs_to_copy = frame64 - static_cast<s64>(headFrame);
// Check that the packet actually contains the data it claims to // Check that the packet actually contains the data it claims to
if ((pad_data_offset + inputs_to_copy * SLIPPI_PAD_DATA_SIZE) > if ((pad_data_offset + inputs_to_copy * SLIPPI_PAD_DATA_SIZE) >
@ -330,9 +330,8 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
for (s64 i = inputs_to_copy - 1; i >= 0; i--) for (s64 i = inputs_to_copy - 1; i >= 0; i--)
{ {
auto pad = auto pad = std::make_unique<SlippiPad>(
std::make_unique<SlippiPad>(static_cast<s32>(frame64 - i), pIdx, static_cast<s32>(frame64 - i), &packetData[pad_data_offset + i * SLIPPI_PAD_DATA_SIZE]);
&packetData[pad_data_offset + i * SLIPPI_PAD_DATA_SIZE]);
remotePadQueue[pIdx].push_front(std::move(pad)); remotePadQueue[pIdx].push_front(std::move(pad));
} }
} }
@ -354,7 +353,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;