piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 15:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

zarg

Browse Source
This commit is contained in:
Arisotura
2023-03-25 00:51:56 +01:00
parent 630ab01ba3
commit 567401200a
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,7 +256,7 @@ void StartHost(const char* playername, int port)
ENetAddress mirroraddr; ENetAddress mirroraddr;
mirroraddr.host = ENET_HOST_ANY; mirroraddr.host = ENET_HOST_ANY;
mirroraddr.port = port + 1; mirroraddr.port = port + 1;
printf("host mirror host connecting to %08X:%d\n", mirroraddr.host, mirroraddr.port);
MirrorHost = enet_host_create(&mirroraddr, 16, 1, 0, 0); MirrorHost = enet_host_create(&mirroraddr, 16, 1, 0, 0);
if (!MirrorHost) if (!MirrorHost)
{ {
@ -337,6 +337,7 @@ void StartMirror(const Player* player)
ENetAddress addr; ENetAddress addr;
addr.host = player->Address; addr.host = player->Address;
addr.port = 8064+1 + player->ID; // FIXME!!!!!!!!!! addr.port = 8064+1 + player->ID; // FIXME!!!!!!!!!!
printf("mirror client connecting to %08X:%d\n", addr.host, addr.port);
ENetPeer* peer = enet_host_connect(MirrorHost, &addr, 1, 0); ENetPeer* peer = enet_host_connect(MirrorHost, &addr, 1, 0);
if (!peer) if (!peer)
{ {
@ -579,6 +580,18 @@ void ProcessClient()
{ {
if (event.packet->dataLength != 2) break; if (event.packet->dataLength != 2) break;
// create mirror host
ENetAddress mirroraddr;
mirroraddr.host = ENET_HOST_ANY;
mirroraddr.port = 8064+1 + data[1]; // FIXME!!!!
printf("client mirror host connecting to %08X:%d\n", mirroraddr.host, mirroraddr.port);
MirrorHost = enet_host_create(&mirroraddr, 16, 1, 0, 0);
if (!MirrorHost)
{
printf("mirror host shat itself :(\n");
break;
}
// send player information // send player information
MyPlayer.ID = data[1]; MyPlayer.ID = data[1];
u8 cmd[1+sizeof(Player)]; u8 cmd[1+sizeof(Player)];
@ -613,13 +626,13 @@ void ProcessClient()
if (i != MyPlayer.ID) if (i != MyPlayer.ID)
SpawnMirrorInstance(Players[i]); SpawnMirrorInstance(Players[i]);
} }
printf("bourf\n");
// tell other mirror instances to start the game // tell other mirror instances to start the game
IPC::SendCommand(0xFFFF, IPC::Cmd_Start, 0, nullptr); IPC::SendCommand(0xFFFF, IPC::Cmd_Start, 0, nullptr);
printf("birf\n");
// start game locally // start game locally
NDS::Start(); NDS::Start();printf("barf\n");
emuThread->emuRun(); emuThread->emuRun();printf("burf\n");
} }
break; break;
} }