Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Mac Lua library

This commit is contained in:
MysterD 2022-01-23 23:00:44 -08:00
parent c4ce0f0fdc
commit 1094f2dd50
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -766,7 +766,7 @@ ifeq ($(WINDOWS_BUILD),1)
LDFLAGS += -Llib/lua/win64 -l:liblua53.a
endif
else ifeq ($(OSX_BUILD),1)
LDFLAGS += -Llib/lua/mac -l:liblua53.a
LDFLAGS += -L./lib/lua/mac/ -l lua53
else
LDFLAGS += -Llib/lua/linux -l:liblua53.a
endif

6
src/pc/network/packets/packet_download.c
View File

@ -112,8 +112,10 @@ void network_send_download(u16 clientIndex, u16 serverIndex, u64 offset) {
void network_receive_download(struct Packet* p) {
SOFT_ASSERT(gNetworkType == NT_CLIENT);
if (p->localIndex != UNKNOWN_LOCAL_INDEX) {
LOG_ERROR("Received download from known local index");
return;
if (gNetworkPlayerServer == NULL || gNetworkPlayerServer->localIndex != p->localIndex) {
LOG_ERROR("Received download from known local index '%d'", p->localIndex);
return;
}
}
u16 clientIndex;

9
src/pc/network/packets/packet_mod_list.c
View File

@ -56,7 +56,14 @@ void network_send_mod_list(void) {
void network_receive_mod_list(struct Packet* p) {
SOFT_ASSERT(gNetworkType == NT_CLIENT);
SOFT_ASSERT(p->localIndex == UNKNOWN_LOCAL_INDEX);
if (p->localIndex != UNKNOWN_LOCAL_INDEX) {
if (gNetworkPlayerServer == NULL || gNetworkPlayerServer->localIndex != p->localIndex) {
LOG_ERROR("Received download from known local index '%d'", p->localIndex);
return;
}
}
if (gModTableRemote.entries != NULL) {
LOG_INFO("received mod list after allocating");
return;