etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 05:25:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Mac Lua library

Browse source
This commit is contained in:
MysterD 2022-01-23 23:00:44 -08:00
parent acf3f77758
commit 47a129573f
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 LDFLAGS += -Llib/lua/win64 -l:liblua53.a
endif endif
else ifeq ($(OSX_BUILD),1) else ifeq ($(OSX_BUILD),1)
LDFLAGS += -Llib/lua/mac -l:liblua53.a LDFLAGS += -L./lib/lua/mac/ -l lua53
else else
LDFLAGS += -Llib/lua/linux -l:liblua53.a LDFLAGS += -Llib/lua/linux -l:liblua53.a
endif endif

4
src/pc/network/packets/packet_download.c
View file

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

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) { void network_receive_mod_list(struct Packet* p) {
SOFT_ASSERT(gNetworkType == NT_CLIENT); 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) { if (gModTableRemote.entries != NULL) {
LOG_INFO("received mod list after allocating"); LOG_INFO("received mod list after allocating");
return; return;