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 project-slippi/Ishiiruka/commit/8f8cd369d55e9c3062cfbffbcd6ac40d04a47da6

Browse source 
remove comparison with game mode enum
This commit is contained in:
Nikhil Narayana 2021-12-18 17:22:43 -08:00
commit 0eee0b18aa
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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 // 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 // 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 // someone else get force removed from queue and have to requeue
auto directMode = SlippiMatchmaking::OnlinePlayMode::DIRECT;
if (SlippiMatchmaking::IsFixedRulesMode(search.mode)) if (SlippiMatchmaking::IsFixedRulesMode(search.mode))
{ {
// Character check // Character check
@ -2029,8 +2028,6 @@ void CEXISlippi::prepareOnlineMatchState()
localPlayerName = p1Name = userInfo.display_name; localPlayerName = p1Name = userInfo.display_name;
} }
auto directMode = SlippiMatchmaking::OnlinePlayMode::DIRECT;
std::vector<u8> leftTeamPlayers = {}; std::vector<u8> leftTeamPlayers = {};
std::vector<u8> rightTeamPlayers = {}; std::vector<u8> rightTeamPlayers = {};
@ -2179,9 +2176,10 @@ void CEXISlippi::prepareOnlineMatchState()
WARN_LOG(SLIPPI_ONLINE, "P1 Char: 0x%X, P2 Char: 0x%X", onlineMatchBlock[0x60], WARN_LOG(SLIPPI_ONLINE, "P1 Char: 0x%X, P2 Char: 0x%X", onlineMatchBlock[0x60],
onlineMatchBlock[0x84]); 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<u8*>(&onlineMatchBlock[2]); u8* gameBitField3 = static_cast<u8*>(&onlineMatchBlock[2]);
*gameBitField3 = lastSearch.mode >= directMode ? *gameBitField3 & 0xF7 : *gameBitField3 | 0x8; *gameBitField3 = SlippiMatchmaking::IsFixedRulesMode(lastSearch.mode) ? *gameBitField3 | 0x8 :
*gameBitField3 & 0xF7;
//*gameBitField3 = *gameBitField3 | 0x8; //*gameBitField3 = *gameBitField3 | 0x8;
// Group players into left/right side for team splash screen display // Group players into left/right side for team splash screen display