From 0eee0b18aa8dfdd9c039159c12ad981c0a437392 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Sat, 18 Dec 2021 17:22:43 -0800 Subject: [PATCH] pull in project-slippi/Ishiiruka/commit/8f8cd369d55e9c3062cfbffbcd6ac40d04a47da6 remove comparison with game mode enum --- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp index a4104d3bee..9863d22366 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp @@ -1828,7 +1828,6 @@ void CEXISlippi::startFindMatch(u8* payload) // While we do have another condition that checks characters after being connected, it's nice to // give someone an early error before they even queue so that they wont enter the queue and make // someone else get force removed from queue and have to requeue - auto directMode = SlippiMatchmaking::OnlinePlayMode::DIRECT; if (SlippiMatchmaking::IsFixedRulesMode(search.mode)) { // Character check @@ -2029,8 +2028,6 @@ void CEXISlippi::prepareOnlineMatchState() localPlayerName = p1Name = userInfo.display_name; } - auto directMode = SlippiMatchmaking::OnlinePlayMode::DIRECT; - std::vector leftTeamPlayers = {}; std::vector rightTeamPlayers = {}; @@ -2179,9 +2176,10 @@ void CEXISlippi::prepareOnlineMatchState() WARN_LOG(SLIPPI_ONLINE, "P1 Char: 0x%X, P2 Char: 0x%X", onlineMatchBlock[0x60], onlineMatchBlock[0x84]); - // Turn pause on in direct, off in everything else + // Turn pause off in unranked/ranked, on in other modes u8* gameBitField3 = static_cast(&onlineMatchBlock[2]); - *gameBitField3 = lastSearch.mode >= directMode ? *gameBitField3 & 0xF7 : *gameBitField3 | 0x8; + *gameBitField3 = SlippiMatchmaking::IsFixedRulesMode(lastSearch.mode) ? *gameBitField3 | 0x8 : + *gameBitField3 & 0xF7; //*gameBitField3 = *gameBitField3 | 0x8; // Group players into left/right side for team splash screen display