Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NetPlay: Sync more settings #9571

Merged
merged 5 commits into from
Mar 27, 2021

Conversation

JosJuice
Copy link
Member

@JosJuice JosJuice commented Mar 6, 2021

Fixes certain netplay desyncs, https://bugs.dolphin-emu.org/issues/10328, and a bug where the Wii language stored in a DTM file would be ignored. Prerequisite for PR #9388.

Source/Core/Core/NetPlayClient.cpp Outdated Show resolved Hide resolved
Source/Core/Core/BootManager.cpp Show resolved Hide resolved
Avoiding desyncs is more important than honoring what the user
specified on the command line.
Fixes netplay and movie overrides of SYSCONF settings not applying.
Whether the custom RTC setting is enabled shouldn't in itself
affect determinism (as long as the actual RTC value is properly
synced). Alters the logic added in 4b2906c.

I'm not entirely certain that this is correct, but the current
code doesn't really make sense to me... If we need to force the
RTC bias to 0 when custom RTC is enabled, why don't we need to
do it when custom RTC is disabled? The code for getting the
host system's current time doesn't contain any special handling
for the guest's RTC bias as far as I can tell.
if (StartUp.bWii)
{
Core::BackupWiiSettings();
ConfigLoaders::SaveToSYSCONF(Config::LayerType::Meta);
const bool want_determinism = Movie::IsMovieActive() || NetPlay::IsNetPlayRunning();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to use Core::UpdateWantDeterminism(true) and Core::WantsDeterminism here?

edit: If we use UpdateWantDeterminism, the call would have to be outside the bWii conditional.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a commit that does this.

Just to make the InitializeWiiRoot call a bit neater.
@leoetlino leoetlino merged commit da534c7 into dolphin-emu:master Mar 27, 2021
@JosJuice JosJuice deleted the netplay-sync-more-settings branch March 27, 2021 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants