Add discord-rpc

Client/core/CCore.cpp

@@ -136,12 +136,18 @@ CCore::CCore()
 
     // Create tray icon
     m_pTrayIcon = new CTrayIcon();
+
+    // Create discord rich presence
+    m_pDiscordRichPresence = new CDiscordRichPresence();
 }
 
 CCore::~CCore()
 {
     WriteDebugEvent("CCore::~CCore");
 
+    // Destroy discord rich presence
+    delete m_pDiscordRichPresence;
+
     // Destroy tray icon
     delete m_pTrayIcon;
 
@@ -585,6 +591,24 @@ void CCore::SetConnected(bool bConnected)
 {
     m_pLocalGUI->GetMainMenu()->SetIsIngame(bConnected);
     UpdateIsWindowMinimized();            // Force update of stuff
+
+    if (bConnected)
+    {
+        time_t timer;
+        time(&timer);
+
+        g_pCore->GetDiscord()->SetPresenceState("In-game");
+        g_pCore->GetDiscord()->SetPresenceDetails("");
+        g_pCore->GetDiscord()->SetPresenceStartTimestamp((long)timer);
+        g_pCore->GetDiscord()->UpdatePresence();
+    } else
+    {
+        g_pCore->GetDiscord()->SetPresenceState("Main Menu");
+        g_pCore->GetDiscord()->SetPresenceDetails("");
+        g_pCore->GetDiscord()->SetPresenceStartTimestamp(0);
+        g_pCore->GetDiscord()->UpdatePresence();
+    }
+
 }
 
 bool CCore::IsConnected()

Client/core/CCore.h

@@ -39,6 +39,7 @@ class CCore;
 #include <ijsify.h>
 #include <core/CWebCoreInterface.h>
 #include "CTrayIcon.h"
+#include "CDiscordRichPresence.h"
 
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
@@ -101,6 +102,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CLocalizationInterface*   GetLocalization() { return g_pLocalization; };
     CWebCoreInterface*        GetWebCore();
     CTrayIconInterface*       GetTrayIcon() { return m_pTrayIcon; };
+    CDiscordInterface*        GetDiscord() { return m_pDiscordRichPresence; };
 
     void SaveConfig(bool bWaitUntilFinished = false);
 
@@ -290,10 +292,11 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CModelCacheManager* m_pModelCacheManager;
 
     // Instances (put new classes here!)
-    CXMLFile*          m_pConfigFile;
-    CClientVariables   m_ClientVariables;
-    CWebCoreInterface* m_pWebCore = nullptr;
-    CTrayIcon*         m_pTrayIcon;
+    CXMLFile*              m_pConfigFile;
+    CClientVariables       m_ClientVariables;
+    CWebCoreInterface*     m_pWebCore = nullptr;
+    CTrayIcon*             m_pTrayIcon;
+    CDiscordRichPresence*  m_pDiscordRichPresence;
 
     // Hook interfaces.
     CMessageLoopHook*        m_pMessageLoopHook;

Client/core/CDiscordRichPresence.cpp

@@ -0,0 +1,73 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto v1.0
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        core/CDiscordRichPresence.cpp
+ *  PURPOSE:     Discord rich presence implementation
+ *
+ *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *
+ *****************************************************************************/
+
+#include "StdInc.h"
+#include "discord_rpc.h"
+
+#define DEFAULT_APP_ID "727214310610436126"
+#define DEFAULT_APP_ASSET "mta_logo_round"
+#define DEFAULT_APP_ASSET_SMALL ""
+#define DEFAULT_APP_ASSET_TEXT ""
+#define DEFAULT_APP_ASSET_SMALL_TEXT ""
+
+CDiscordRichPresence::CDiscordRichPresence()
+{
+    DiscordEventHandlers handlers;
+    memset(&handlers, 0, sizeof(handlers));
+    m_strDiscordAppId = DEFAULT_APP_ID;
+    m_strDiscordAppAsset = DEFAULT_APP_ASSET;
+    m_strDiscordAppAssetSmall = DEFAULT_APP_ASSET_SMALL;
+    m_strDiscordAppAssetText = DEFAULT_APP_ASSET_TEXT;
+    m_strDiscordAppAssetSmallText = DEFAULT_APP_ASSET_SMALL_TEXT;
+
+    m_strDiscordAppCurrentId = DEFAULT_APP_ID;
+    m_strDiscordAppState = "";
+    m_strDiscordAppDetails = "";
+    m_uiDiscordAppStart = 0;
+    m_uiDiscordAppEnd = 0;
+
+    Discord_Initialize(m_strDiscordAppId, &handlers, 1, nullptr);
+}
+
+CDiscordRichPresence::~CDiscordRichPresence()
+{
+    m_strDiscordAppId = DEFAULT_APP_ID;
+    Discord_Shutdown();
+    DiscordEventHandlers handlers;
+    memset(&handlers, 0, sizeof(handlers));
+}
+
+void CDiscordRichPresence::UpdatePresence()
+{
+    DiscordRichPresence discordPresence;
+    memset(&discordPresence, 0, sizeof(discordPresence));
+    discordPresence.largeImageKey = m_strDiscordAppAsset;
+    discordPresence.state = m_strDiscordAppState;
+    discordPresence.details = m_strDiscordAppDetails;
+    discordPresence.startTimestamp = m_uiDiscordAppStart;
+
+    Discord_UpdatePresence(&discordPresence);
+}
+
+void CDiscordRichPresence::SetPresenceState(const char* szState)
+{
+    m_strDiscordAppState = szState;
+}
+
+void CDiscordRichPresence::SetPresenceDetails(const char* szDetails)
+{
+    m_strDiscordAppDetails = szDetails;
+}
+
+void CDiscordRichPresence::SetPresenceStartTimestamp(const unsigned long ulStart)
+{
+    m_uiDiscordAppStart = ulStart;
+}

Client/core/CDiscordRichPresence.h

@@ -0,0 +1,43 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto v1.0
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        core/CDiscordRichPresence.h
+ *  PURPOSE:     Header file for discord rich presence
+ *
+ *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *
+ *****************************************************************************/
+#pragma once
+
+#include <core/CDiscordInterface.h>
+#include <string>
+
+class CDiscordRichPresence : public CDiscordInterface
+{
+public:
+    CDiscordRichPresence();
+    ~CDiscordRichPresence();
+
+    // void SetApplicationId();
+    void UpdatePresence();
+    void SetPresenceState(const char* szState);
+    void SetPresenceDetails(const char* szDetails);
+    void SetPresenceStartTimestamp(const unsigned long ulStart);
+    // void SetPresenceTimestamp();
+    // void SetPresenceImage();
+    // void SetPresenceText();
+
+private:
+    const char* m_strDiscordAppId;
+    const char* m_strDiscordAppAsset;
+    const char* m_strDiscordAppAssetSmall;
+    const char* m_strDiscordAppAssetText;
+    const char* m_strDiscordAppAssetSmallText;
+
+    const char*   m_strDiscordAppCurrentId;
+    const char*   m_strDiscordAppState;
+    const char*   m_strDiscordAppDetails;
+    unsigned long m_uiDiscordAppStart;
+    unsigned long m_uiDiscordAppEnd;
+};

Client/core/CMainMenu.cpp

@@ -286,6 +286,10 @@ CMainMenu::CMainMenu(CGUI* pManager)
     // We're not ingame
     SetIsIngame(false);
 
+    // Discord
+    g_pCore->GetDiscord()->SetPresenceState("Main Menu");
+    g_pCore->GetDiscord()->UpdatePresence();
+
     // Store the pointer to the graphics subsystem
     m_pGraphics = CGraphics::GetSingletonPtr();
 

Client/core/premake5.lua

@@ -20,6 +20,7 @@ project "Client Core"
 			"../../vendor/pthreads/include",
 			"../../vendor/sparsehash/src/",
 			"../../vendor/detours/4.0.1/src",
+			"../../vendor/discord-rpc/discord/include",
 		}
 
 	pchheader "StdInc.h"
@@ -46,7 +47,7 @@ project "Client Core"
 	links {
 		"ws2_32", "d3dx9", "Userenv", "DbgHelp", "xinput", "Imagehlp", "dxguid", "dinput8",
 		"strmiids",	"odbc32", "odbccp32", "shlwapi", "winmm", "gdi32", "Imm32", "Psapi",
-		"pthread", "libpng", "jpeg", "zlib", "tinygettext",
+		"pthread", "libpng", "jpeg", "zlib", "tinygettext", "discord-rpc"
 	}
 
 	defines {

Client/sdk/core/CDiscordInterface.h

@@ -0,0 +1,20 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto v1.0
+ *               (Shared logic for modifications)
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        sdk/core/CDiscordInterface.h
+ *  PURPOSE:     Discord interface class
+ *
+ *****************************************************************************/
+
+#pragma once
+
+class CDiscordInterface
+{
+public:
+    virtual void UpdatePresence() = 0;
+    virtual void SetPresenceState(const char* szState) = 0;
+    virtual void SetPresenceDetails(const char* szDetails) = 0;
+    virtual void SetPresenceStartTimestamp(const unsigned long ulStart) = 0;
+};