From 2f4008f9c92ecd06a1abf294b5b8f960f10ab3bd Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Tue, 4 Apr 2023 16:22:07 -0700
Subject: [PATCH] Fixed compiling with DISCORD_SDK=0

---
 src/pc/network/discord/discord.c | 1 -
 src/pc/network/discord/discord.h | 1 -
 src/pc/network/network.c         | 6 ++++++
 src/pc/network/network.h         | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pc/network/discord/discord.c b/src/pc/network/discord/discord.c
index b7c3a0c3..0311d760 100644
--- a/src/pc/network/discord/discord.c
+++ b/src/pc/network/discord/discord.c
@@ -22,7 +22,6 @@ struct DiscordApplication app = { 0 };
 bool gDiscordInitialized = false;
 bool gDiscordFailed = false;
 bool alreadyRun = false;
-bool gDiscordReconnecting = false;
 
 static void discord_sdk_log_callback(UNUSED void* hook_data, enum EDiscordLogLevel level, const char* message) {
     LOGFILE_INFO(LFT_DISCORD, "callback (%d): %s", level, message);
diff --git a/src/pc/network/discord/discord.h b/src/pc/network/discord/discord.h
index a9e0189b..25a86cc5 100644
--- a/src/pc/network/discord/discord.h
+++ b/src/pc/network/discord/discord.h
@@ -29,7 +29,6 @@ void discord_fatal(int rc);
 extern struct NetworkSystem gNetworkSystemDiscord;
 extern bool gDiscordInitialized;
 extern bool gDiscordFailed;
-extern bool gDiscordReconnecting;
 
 struct DiscordApplication {
     struct IDiscordCore* core;
diff --git a/src/pc/network/network.c b/src/pc/network/network.c
index a221449f..8e705f17 100644
--- a/src/pc/network/network.c
+++ b/src/pc/network/network.c
@@ -57,6 +57,7 @@ u32 gNetworkAreaTimer = 0;
 void* gNetworkServerAddr = NULL;
 bool gNetworkSentJoin = false;
 u16 gNetworkRequestLocationTimer = 0;
+bool gDiscordReconnecting = false;
 
 u8 gDebugPacketIdBuffer[256] = { 0xFF };
 u8 gDebugPacketSentBuffer[256] = { 0 };
@@ -409,9 +410,14 @@ void network_reconnect_begin(void) {
     }
 
     sNetworkReconnectTimer = 2 * 30;
+
+#ifdef DISCORD_SDK
     sNetworkReconnectType = (gNetworkSystem == &gNetworkSystemDiscord)
                           ? NS_DISCORD
                           : NS_SOCKET;
+#else
+    sNetworkReconnectType = NS_SOCKET;
+#endif
 
     gDiscordReconnecting = true;
     network_shutdown(false, false, false);
diff --git a/src/pc/network/network.h b/src/pc/network/network.h
index 8d28b13a..b2f15471 100644
--- a/src/pc/network/network.h
+++ b/src/pc/network/network.h
@@ -89,6 +89,7 @@ extern u8 gDebugPacketIdBuffer[];
 extern u8 gDebugPacketSentBuffer[];
 extern u8 gDebugPacketOnBuffer;
 extern u32 gNetworkStartupTimer;
+extern bool gDiscordReconnecting;
 
 // network.c
 void network_set_system(enum NetworkSystemType nsType);