mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-22 03:55:11 +00:00
Fixed Mac Lua library
This commit is contained in:
parent
acf3f77758
commit
47a129573f
3 changed files with 13 additions and 4 deletions
2
Makefile
2
Makefile
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue