pick 88eb962 from ishii

This commit is contained in:
r2dliu 2020-07-17 15:17:29 -04:00
commit 671f49db89

View file

@ -1900,13 +1900,13 @@ void CEXISlippi::setMatchSelections(u8* payload)
s.isCharacterSelected = payload[2]; s.isCharacterSelected = payload[2];
s.stageId = Common::swap16(&payload[3]); s.stageId = Common::swap16(&payload[3]);
s.isStageSelected = payload[5]; u8 stageSelectOption = payload[5];
if (!s.isStageSelected) s.isStageSelected = stageSelectOption == 1 || stageSelectOption == 3;
if (stageSelectOption == 3)
{ {
// If stage is not selected, select a random stage // If stage requested is random, select a random stage
s.stageId = getRandomStage(); s.stageId = getRandomStage();
s.isStageSelected = true;
} }
s.rngOffset = generator() % 0xFFFF; s.rngOffset = generator() % 0xFFFF;