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

Merge remote-tracking branch 'origin/master' into season4

This commit is contained in:
Arisotura 2024-08-11 10:50:59 +02:00
parent 18ea2bc24e e290c42360
commit a35865620f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -49,7 +49,7 @@
]; ];
qtWrapperArgs = optionals isLinux [ qtWrapperArgs = optionals isLinux [
"--prefix LD_LIBRARY_PATH : ${makeLibraryPath [ pkgs.libpcap ]}" "--prefix LD_LIBRARY_PATH : ${makeLibraryPath [ pkgs.libpcap pkgs.wayland ]}"
] ++ optionals isDarwin [ ] ++ optionals isDarwin [
"--prefix DYLD_LIBRARY_PATH : ${makeLibraryPath [ pkgs.libpcap ]}" "--prefix DYLD_LIBRARY_PATH : ${makeLibraryPath [ pkgs.libpcap ]}"
]; ];

3
src/net/Netplay.cpp
View File

@ -25,7 +25,6 @@
#include "NDS.h" #include "NDS.h"
#include "NDSCart.h" #include "NDSCart.h"
#include "main.h"
//#include "IPC.h" //#include "IPC.h"
#include "Netplay.h" #include "Netplay.h"
//#include "Input.h" //#include "Input.h"
@ -442,7 +441,7 @@ printf("[MC] start blob type=%d len=%d\n", type, len);
u8* dst = Blobs[type]; u8* dst = Blobs[type];
if (!dst) return; if (!dst) return;
if (BlobLens[type] != len) return; if (BlobLens[type] != len) return;
printf("[MC] recv blob data, type=%d pos=%08X len=%08X data=%08X\n", type, pos, len, pkt->dataLength-16); printf("[MC] recv blob data, type=%d pos=%08X len=%08X data=%08lX\n", type, pos, len, pkt->dataLength-16);
memcpy(&dst[pos], &buf[16], pkt->dataLength-16); memcpy(&dst[pos], &buf[16], pkt->dataLength-16);
} }
else if (buf[0] == 0x03) else if (buf[0] == 0x03)