diff --git a/Makefile b/Makefile index d5516432..885f9095 100644 --- a/Makefile +++ b/Makefile @@ -976,9 +976,9 @@ COOPNET_LIBS := ifeq ($(COOPNET),1) ifeq ($(WINDOWS_BUILD),1) ifeq ($(TARGET_BITS), 32) - LDFLAGS += -Llib/coopnet/win32 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 + LDFLAGS += -Llib/coopnet/win32 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 -liphlpapi else - LDFLAGS += -Llib/coopnet/win64 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 + LDFLAGS += -Llib/coopnet/win64 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 -liphlpapi endif else ifeq ($(OSX_BUILD),1) LDFLAGS += -Wl,-rpath,@loader_path -L./lib/coopnet/mac/ -l coopnet diff --git a/lib/coopnet/win64/libcoopnet.a b/lib/coopnet/win64/libcoopnet.a index b14e7c99..0c877b78 100644 Binary files a/lib/coopnet/win64/libcoopnet.a and b/lib/coopnet/win64/libcoopnet.a differ diff --git a/src/pc/discord/discord.c b/src/pc/discord/discord.c index 2e56e015..5ca20204 100644 --- a/src/pc/discord/discord.c +++ b/src/pc/discord/discord.c @@ -36,7 +36,11 @@ void discord_fatal(int rc) { } if (rc != DiscordResult_Ok) { - LOG_ERROR("Discord threw an error. RC: %d", rc); + static sDiscordReported = false; + if (!sDiscordReported) { + sDiscordReported = true; + LOG_ERROR("Discord threw an error. RC: %d", rc); + } } } diff --git a/src/pc/gfx/gfx_cc.c b/src/pc/gfx/gfx_cc.c index 1f71e553..1463bde5 100644 --- a/src/pc/gfx/gfx_cc.c +++ b/src/pc/gfx/gfx_cc.c @@ -68,7 +68,7 @@ void gfx_cc_print(struct ColorCombiner *cc) { printf("0x%08x", cm->flags); printf(");"); - printf(" // %016lx", cm->hash); + printf(" // %016" PRIx64, cm->hash); printf("\n"); #endif } diff --git a/src/pc/network/packets/packet_chat.c b/src/pc/network/packets/packet_chat.c index c1ff5483..46eddfff 100644 --- a/src/pc/network/packets/packet_chat.c +++ b/src/pc/network/packets/packet_chat.c @@ -100,7 +100,7 @@ void network_receive_chat(struct Packet* p) { // add the message djui_chat_message_create_from(globalIndex, remoteMessage); - if (gNetworkSystem && gNetworkSystem->get_id_str && np && np->name) { + if (gNetworkSystem && gNetworkSystem->get_id_str && np) { LOG_CONSOLE("[%s] %s: %s", gNetworkSystem->get_id_str(np->localIndex), np->name, remoteMessage); } LOG_INFO("rx chat: %s", remoteMessage);