From a87f4ca984a0037baf44d37a7bad1cd2fe7cf80a Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Sun, 19 Dec 2021 11:39:36 -0800 Subject: [PATCH] pull in project-slippi/Ishiiruka/pull/246/commits/cd2cf4fb44ae11bb96a99c56abbd2eaa8723f231 fix stage selection on first match bug --- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp | 7 ------- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h | 1 - 2 files changed, 8 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp index 04cabb8dd5..046da4eb8e 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp @@ -2339,12 +2339,6 @@ void CEXISlippi::setMatchSelections(u8* payload) s.rngOffset = generator() % 0xFFFF; - if (matchmaking->LocalPlayerIndex() == 1 && firstMatch) - { - firstMatch = false; - s.stageId = getRandomStage(onlineMode); - } - // Merge these selections localSelections.Merge(s); @@ -2542,7 +2536,6 @@ void CEXISlippi::handleConnectionCleanup() // Reset play session is_play_session_active = false; - firstMatch = true; #ifdef LOCAL_TESTING isLocalConnected = false; diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h index e429b14f53..e8f731a0de 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h @@ -224,7 +224,6 @@ private: u32 frameSeqIdx = 0; bool isEnetInitialized = false; - bool firstMatch = true; std::default_random_engine generator;