Add Discord Game SDK support

.vscode/settings.json

@@ -0,0 +1 @@
+{}

desktop_version/CMakeLists.txt

@@ -11,6 +11,7 @@ option(BUNDLE_DEPENDENCIES "Use bundled TinyXML-2, PhysicsFS, and FAudio (if dis
 
 option(STEAM "Use the Steam API" OFF)
 option(GOG "Use the GOG API" OFF)
+option(DISCORD "Use the Discord API" OFF)
 
 option(OFFICIAL_BUILD "Compile an official build of the game" OFF)
 
@@ -19,6 +20,7 @@ option(MAKEANDPLAY "Compile a version of the game without the main campaign (pro
 if(OFFICIAL_BUILD AND NOT MAKEANDPLAY)
     set(STEAM ON)
     set(GOG ON)
+    set(DISCORD ON)
 endif()
 
 option(REMOVE_ABSOLUTE_PATHS "If supported by the compiler, replace all absolute paths to source directories compiled into the binary (if any) with relative paths" ON)
@@ -133,6 +135,9 @@ endif()
 if(GOG)
     list(APPEND VVV_C_SRC src/GOGNetwork.c)
 endif()
+if(DISCORD)
+    list(APPEND VVV_C_SRC src/DiscordNetwork.c)
+endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
     list(APPEND VVV_C_SRC src/SDL_uikit_main.c)
 endif()
@@ -210,6 +215,9 @@ endif()
 if(GOG)
     target_compile_definitions(VVVVVV PRIVATE -DGOG_NETWORK)
 endif()
+if(DISCORD)
+    target_compile_definitions(VVVVVV PRIVATE -DDISCORD_NETWORK)
+endif()
 
 set(XML2_SRC
     ../third_party/tinyxml2/tinyxml2.cpp

desktop_version/src/DiscordNetwork.c

@@ -0,0 +1,165 @@
+#include "MakeAndPlay.h"
+
+#ifndef MAKEANDPLAY
+
+#include <stdint.h>
+#include <stdio.h>
+#include <assert.h>
+#include <SDL.h>
+#ifdef _WIN32
+#include <Windows.h>
+#else
+#include <unistd.h>
+#include <string.h>
+#endif
+
+#include "Vlogging.h"
+
+// Library includes
+#include "discord_game_sdk.h"
+
+#if defined(_WIN32)
+#define DISCORD_LIBRARY "discord_game_sdk.dll"
+#elif defined(__APPLE__)
+#define DISCORD_LIBRARY "libdiscord_game_sdk.dylib"
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
+#define DISCORD_LIBRARY "libdiscord_game_sdk.so"
+#else
+#error DISCORD_LIBRARY: Unrecognized platform!
+#endif
+
+
+#define DISCORD_CRASH_LIMIT 10
+#define DISCORD_CLIENT_ID 1315544357532729447 // TO TERRY/FLIBIT: You can create your own Discord instance at the Discord Developer Portal. This ID belongs to me, so just be aware that if my account was to get hacked, VVVVVV RPC would too. Use your own!
+
+
+struct DISCORD_application {
+    struct IDiscordCore* core;
+    struct IDiscordActivityManager* activityMan;
+} app;
+
+struct DiscordActivity activity;
+
+int discordCrashes = 0; // This is here to ensure we do not get stuck in a theoratical softlock of opening and crashing Discord instances.
+
+static void* libHandle = NULL;
+
+
+#define FUNC_LIST \
+    FOREACH_FUNC(enum EDiscordResult, DiscordCreate, (DiscordVersion, struct DiscordCreateParams*, struct IDiscordCore**))
+
+
+
+#define FOREACH_FUNC(rettype, name, params) static rettype (*name) params = NULL;
+FUNC_LIST
+#undef FOREACH_FUNC
+
+static void ClearPointers(void)
+{
+    SDL_UnloadObject(libHandle);
+    libHandle = NULL;
+#define FOREACH_FUNC(rettype, name, params) name = NULL;
+    FUNC_LIST
+#undef FOREACH_FUNC
+}
+
+void DISCORD_shutdown(void)
+{
+    if (libHandle)
+    {
+        ClearPointers();
+    }
+}
+
+int32_t DISCORD_init(void)
+{
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
+    return 0;
+#endif
+    libHandle = SDL_LoadObject(DISCORD_LIBRARY);
+    if (!libHandle)
+    {
+        vlog_info(DISCORD_LIBRARY " not found!");
+        printf("Can't load object %s : %s\n", DISCORD_LIBRARY, SDL_GetError());
+        return 0;
+    }
+
+#define FOREACH_FUNC(rettype, name, params) \
+    name = (rettype (*) params) (intptr_t) SDL_LoadFunction(libHandle, #name); \
+    if (!name) \
+    { \
+        vlog_error(DISCORD_LIBRARY " symbol " #name " not found!"); \
+        ClearPointers(); \
+        return 0; \
+    }
+    FUNC_LIST
+#undef FOREACH_FUNC
+    memset(&app, 0, sizeof(app));
+
+    struct DiscordCreateParams params;
+    params.client_id = DISCORD_CLIENT_ID;
+    params.flags = DiscordCreateFlags_Default;
+
+    if(!DiscordCreate(DISCORD_VERSION, &params, &app.core))
+    {
+        return 1;
+    }
+
+
+    strncpy(activity.state, "On the Main Menu", 128);
+    //strncpy(activity.details, "I'm Sorry", 128);
+    strncpy(activity.assets.large_image, "vvvvvv", 128);
+    strncpy(activity.assets.large_text, "Dimension  VVVVVV", 128);
+
+    app.activityMan = app.core->get_activity_manager(app.core);
+    app.activityMan->update_activity(app.activityMan, &activity, NULL, NULL);
+
+
+
+    return 0;
+}
+
+void DISCORD_REQUIRE(int x) {
+    if(discordCrashes > DISCORD_CRASH_LIMIT)
+    {
+        DISCORD_shutdown();
+        return;
+    }
+    if(x != DiscordResult_Ok)
+    {
+        ++discordCrashes;
+        DISCORD_shutdown();
+        DISCORD_init();
+        return;
+    }
+    discordCrashes = 0;
+}
+
+void DISCORD_update(const char *level, const char *name)
+{
+    if(discordCrashes > DISCORD_CRASH_LIMIT) {
+        return;
+    }
+    if(app.activityMan == NULL)
+    {
+        app.activityMan = app.core->get_activity_manager(app.core);
+    }
+    strncpy(activity.state, name, 127);
+    strncpy(activity.assets.large_image, "vvvvvv", 127);
+    strncpy(activity.assets.large_text, level, 127);
+    activity.state[127] = '\0';
+    activity.assets.large_image[127] = '\0';
+    activity.assets.large_text[127] = '\0';
+
+    app.activityMan->update_activity(app.activityMan, &activity, NULL, NULL);
+
+    DISCORD_REQUIRE(app.core->run_callbacks(app.core));
+}
+void DISCORD_unlockAchievement(const char *name)
+{
+    // No "achivements" in Discord
+}
+
+
+
+#endif // MakeAndPlay

desktop_version/src/GOGNetwork.c

@@ -15,7 +15,7 @@ void GOG_shutdown(void)
 {
 }
 
-void GOG_update(void)
+void GOG_update(const char *level, const char *name)
 {
 }
 

desktop_version/src/Network.c

@@ -1,4 +1,5 @@
 #include <stdint.h>
+#include <stdio.h>
 
 #include "MakeAndPlay.h"
 #include "Unused.h"
@@ -10,6 +11,9 @@
     #ifdef GOG_NETWORK
         #undef GOG_NETWORK
     #endif
+    #ifdef DISCORD_NETWORK
+        #undef DISCORD_NETWORK
+    #endif
 #endif
 
 #ifdef STEAM_NETWORK
@@ -22,27 +26,35 @@
 #else
 #define GOG_NUM 0
 #endif
+#ifdef DISCORD_NETWORK
+#define DISCORD_NUM 1
+#else
+#define DISCORD_NUM 0
+#endif
 
-#define NUM_BACKENDS (STEAM_NUM+GOG_NUM)
+#define NUM_BACKENDS (STEAM_NUM+GOG_NUM+DISCORD_NUM)
 #define DECLARE_BACKEND(name) \
     int32_t name##_init(void); \
     void name##_shutdown(void); \
-    void name##_update(void); \
+    void name##_update(const char *level, const char *name); \
     void name##_unlockAchievement(const char *name);
 #ifdef STEAM_NETWORK
 DECLARE_BACKEND(STEAM)
 #endif
 #ifdef GOG_NETWORK
 DECLARE_BACKEND(GOG)
 #endif
+#ifdef DISCORD_NETWORK
+DECLARE_BACKEND(DISCORD)
+#endif
 #undef DECLARE_BACKEND
 
 typedef struct NetworkBackend
 {
     int32_t IsInit;
     int32_t (*Init)(void);
     void (*Shutdown)(void);
-    void (*Update)(void);
+    void (*Update)(const char*, const char*);
     void (*UnlockAchievement)(const char*);
 } NetworkBackend;
 
@@ -64,6 +76,9 @@ int NETWORK_init(void)
     #ifdef GOG_NETWORK
     ASSIGN_BACKEND(GOG, STEAM_NUM)
     #endif
+    #ifdef DISCORD_NETWORK
+    ASSIGN_BACKEND(DISCORD, STEAM_NUM+GOG_NUM)
+    #endif
     #undef ASSIGN_BACKEND
     #if NUM_BACKENDS > 0
     for (i = 0; i < NUM_BACKENDS; i += 1)
@@ -89,14 +104,14 @@ void NETWORK_shutdown(void)
     #endif
 }
 
-void NETWORK_update(void)
+void NETWORK_update(const char *level, const char *name)
 {
     #if NUM_BACKENDS > 0
     int32_t i;
     for (i = 0; i < NUM_BACKENDS; i += 1)
     if (backends[i].IsInit)
     {
-        backends[i].Update();
+        backends[i].Update(level, name);
     }
     #endif
 }

desktop_version/src/Network.h

@@ -11,7 +11,7 @@ int32_t NETWORK_init(void);
 
 void NETWORK_shutdown(void);
 
-void NETWORK_update(void);
+void NETWORK_update(const char *level, const char *name);
 
 void NETWORK_unlockAchievement(const char *name);
 

desktop_version/src/SteamNetwork.c

@@ -234,7 +234,7 @@ void STEAM_shutdown(void)
     }
 }
 
-void STEAM_update(void)
+void STEAM_update(const char *level, const char *name)
 {
     if (!libHandle)
     {