mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-05 00:56:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: crash when starting a teams match

Browse source 
a single damn colon fixed the entire issue
This commit is contained in:
Nikhil Narayana 2023-09-02 16:34:16 -07:00
commit 1956b69b1e
No known key found for this signature in database
GPG key ID: 2D6E647B8732451F
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1462,7 +1462,7 @@ bool CEXISlippi::shouldAdvanceOnlineFrame(s32 frame)
// SConfig::GetInstance().m_EmulationSpeed = dynamic_emu_speed; // SConfig::GetInstance().m_EmulationSpeed = dynamic_emu_speed;
// SConfig::GetInstance().m_EmulationSpeed = 0.97f; // used for testing // SConfig::GetInstance().m_EmulationSpeed = 0.97f; // used for testing
INFO_LOG_FMT(SLIPPI_ONLINE, "[Frame {}] Offset for advance is: {} us. New speed: {.4}%", frame, INFO_LOG_FMT(SLIPPI_ONLINE, "[Frame {}] Offset for advance is: {} us. New speed: {:.4}%", frame,
offset_us, dynamic_emu_speed * 100.0f); offset_us, dynamic_emu_speed * 100.0f);
s32 frame_time = 16683; s32 frame_time = 16683;
@ -2298,7 +2298,7 @@ void CEXISlippi::prepareOnlineMatchState()
std::vector<std::vector<u8>> team_assignment_permutations = { std::vector<std::vector<u8>> team_assignment_permutations = {
{0, 0, 1, 1}, {1, 1, 0, 0}, {0, 1, 1, 0}, {1, 0, 0, 1}, {0, 1, 0, 1}, {1, 0, 1, 0}, {0, 0, 1, 1}, {1, 1, 0, 0}, {0, 1, 1, 0}, {1, 0, 0, 1}, {0, 1, 0, 1}, {1, 0, 1, 0},
}; };
auto teamAssignments = auto team_assignments =
team_assignment_permutations[rng_offset % team_assignment_permutations.size()]; team_assignment_permutations[rng_offset % team_assignment_permutations.size()];
// Overwrite player character choices // Overwrite player character choices
@ -2311,7 +2311,7 @@ void CEXISlippi::prepareOnlineMatchState()
if (are_all_same_team) if (are_all_same_team)
{ {
// Overwrite team_id. Color is overwritten by ASM // Overwrite team_id. Color is overwritten by ASM
s->team_id = teamAssignments[s->player_idx]; s->team_id = team_assignments[s->player_idx];
} }
// Overwrite player character // Overwrite player character