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

pull in b9bcbd4869551588b9228617bfff4f55696c592f. fix some warnings

Browse source
This commit is contained in:
R2DLiu 2021-12-19 17:03:06 -05:00
commit 7d5ba4bf45
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1542,7 +1542,8 @@ void CEXISlippi::handleOnlineInputs(u8* payload)
// Reset character selections as they are no longer needed // Reset character selections as they are no longer needed
localSelections.Reset(); localSelections.Reset();
slippi_netplay->StartSlippiGame(); if (slippi_netplay)
slippi_netplay->StartSlippiGame();
} }
if (isDisconnected()) if (isDisconnected())
@ -1919,13 +1920,13 @@ void CEXISlippi::prepareOnlineMatchState()
u8 localPlayerReady = localSelections.isCharacterSelected; u8 localPlayerReady = localSelections.isCharacterSelected;
u8 remotePlayersReady = 0; u8 remotePlayersReady = 0;
u8 localPlayerIndex = matchmaking->LocalPlayerIndex();
u8 remotePlayerIndex = 1;
auto userInfo = user->GetUserInfo(); auto userInfo = user->GetUserInfo();
if (mmState == SlippiMatchmaking::ProcessState::CONNECTION_SUCCESS) if (mmState == SlippiMatchmaking::ProcessState::CONNECTION_SUCCESS)
{ {
localPlayerIndex = matchmaking->LocalPlayerIndex();
if (!slippi_netplay) if (!slippi_netplay)
{ {
#ifdef LOCAL_TESTING #ifdef LOCAL_TESTING

6
Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h
View file

@ -198,7 +198,6 @@ private:
void prepareGctLength(); void prepareGctLength();
void prepareGctLoad(u8* payload); void prepareGctLoad(u8* payload);
void prepareDelayResponse(); void prepareDelayResponse();
int getCharColor(u8 charId, u8 teamId);
void FileWriteThread(void); void FileWriteThread(void);
@ -232,6 +231,11 @@ private:
// Used to determine when to detect when a new session has started // Used to determine when to detect when a new session has started
bool is_play_session_active = false; bool is_play_session_active = false;
// We put these at the class level to preserve values in the case of a disconnect
// while loading. Without this, someone could load into a game playing the wrong char
u8 localPlayerIndex = 0;
u8 remotePlayerIndex = 1;
// Frame skipping variables // Frame skipping variables
int framesToSkip = 0; int framesToSkip = 0;
bool isCurrentlySkipping = false; bool isCurrentlySkipping = false;

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

@ -34,8 +34,8 @@
struct SlippiRemotePadOutput struct SlippiRemotePadOutput
{ {
int32_t latestFrame; int32_t latestFrame{};
u8 playerIdx; u8 playerIdx{};
std::vector<u8> data; std::vector<u8> data;
}; };
@ -185,7 +185,7 @@ protected:
struct FrameOffsetData struct FrameOffsetData
{ {
// TODO: Should the buffer size be dynamic based on time sync interval or not? // TODO: Should the buffer size be dynamic based on time sync interval or not?
int idx; int idx{};
std::vector<s32> buf; std::vector<s32> buf;
}; };