ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more proper sync

This commit is contained in:
Arisotura 2023-04-05 22:28:33 +02:00
parent 1d5a05259d
commit 946385cd8e
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/frontend/qt_sdl/Netplay.cpp
View File

@ -519,7 +519,7 @@ bool SendBlobToMirrorClients(int type, u32 len, u8* data)
return true;
}
void RecvBlobFromMirrorHost(ENetPacket* pkt)
void RecvBlobFromMirrorHost(ENetPeer* peer, ENetPacket* pkt)
{
u8* buf = pkt->data;
if (buf[0] == 0x01)
@ -629,6 +629,12 @@ void RecvBlobFromMirrorHost(ENetPacket* pkt)
}
// TODO: load state!!!!
ENetPacket* resp = enet_packet_create(buf, 1, ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(peer, 1, resp);
}
else if (buf[0] == 0x05)
{
printf("[MIRROR CLIENT] start\n");
StartLocal();
}
@ -649,6 +655,26 @@ void SyncMirrorClients()
ENetPacket* pkt = enet_packet_create(&data, 2, ENET_PACKET_FLAG_RELIABLE);
enet_host_broadcast(MirrorHost, 1, pkt);
// wait for all clients to have caught up
int ngood = 0;
ENetEvent evt;
while (enet_host_service(MirrorHost, &evt, 5000) > 0)
{
if (evt.type == ENET_EVENT_TYPE_RECEIVE && evt.channelID == 1)
{
if (evt.packet->dataLength == 1 && evt.packet->data[0] == 0x04)
ngood++;
}
else
break;
if (ngood >= (NumPlayers-1))
break;
}
if (ngood != (NumPlayers-1))
printf("!!! BAD!! %d %d\n", ngood, NumPlayers);
printf("[MIRROR HOST] clients synced\n");
}
@ -1037,7 +1063,7 @@ printf("mirror client lag notify: %d\n", lag);
}
else if (event.channelID == 1)
{
RecvBlobFromMirrorHost(event.packet);
RecvBlobFromMirrorHost(event.peer, event.packet);
}
break;
}