Skip to content

Fix desync on netplay start #193

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.

Sign up for GitHub

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

Open
tilderain wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix desync on netplay start #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions platform/ds/arm9/source/nifi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,10 @@ int nifiStartLink() {

nifiFrameCounter = -1;

memset((void*)&receivedInputReady, 0, sizeof(receivedInputReady));
memset((void*)&receivedInput, 0, sizeof(receivedInput));
memset(oldInputs, 0, sizeof(oldInputs));

mgr_reset();
if (nifiLinkType == LINK_CABLE) {
printLog("Start Gb2\n");
Expand All @@ -574,12 +578,6 @@ int nifiStartLink() {
if (nifiLinkType == LINK_CABLE)
mgr_setInternalClockGb(gameboy);

// Fill in first few frames of client's input
for (int i=0; i<CLIENT_FRAME_LAG; i++) {
receivedInputReady[i] = true;
receivedInput[i] = 0xff;
}

// Set input destinations
if (nifiLinkType == LINK_SGB) {
nifiInputDest = &gameboy->controllers[0];
Expand All @@ -599,10 +597,6 @@ int nifiStartLink() {
if (nifiLinkType == LINK_CABLE)
mgr_setInternalClockGb(gb2);

// First few frames of input are skipped, so fill them in
for (int i=0; i<OLD_INPUTS_BUFFER_SIZE; i++)
oldInputs[i] = 0xff;

// Set input destinations
if (nifiLinkType == LINK_SGB) {
nifiInputDest = &gameboy->controllers[1];
Expand Down