Merge branch 'master' into l10n/master

Author: Dutchman101

Client/core/CClientVariables.cpp

@@ -359,6 +359,7 @@ void CClientVariables::LoadDefaults()
     DEFAULT("browser_enable_gpu", true);                                              // Enable GPU in CEF? (allows stuff like WebGL to function)
     DEFAULT("process_cpu_affinity", true);                                            // Set CPU 0 affinity to improve game performance and fix the known issue in single-threaded games
     DEFAULT("ask_before_disconnect", true);                                           // Ask before disconnecting from a server
+    DEFAULT("allow_steam_client", false);                                             // Allow connecting with the local Steam client (to set GTA:SA ingame status)
 
     if (!Exists("locale"))
     {

Client/core/CCore.cpp

@@ -26,6 +26,7 @@
 #include <SharedUtil.Detours.h>
 #include <ServerBrowser/CServerCache.h>
 #include "CDiscordRichPresence.h"
+#include "CSteamClient.h"
 
 using SharedUtil::CalcMTASAPath;
 using namespace std;
@@ -160,6 +161,7 @@ CCore::CCore()
 
     // Create tray icon
     m_pTrayIcon = new CTrayIcon();
+    m_steamClient = std::make_unique<CSteamClient>();
 
     // Create discord rich presence
     m_pDiscordRichPresence = std::shared_ptr<CDiscordRichPresence>(new CDiscordRichPresence());
@@ -173,6 +175,8 @@ CCore::~CCore()
     if (m_pDiscordRichPresence)
         m_pDiscordRichPresence.reset();
 
+    m_steamClient.reset();
+
     // Destroy tray icon
     delete m_pTrayIcon;
 
@@ -1228,6 +1232,12 @@ void CCore::DoPostFramePulse()
         ApplyConsoleSettings();
         ApplyGameSettings();
 
+        // Allow connecting with the local Steam client
+        bool allowSteamClient = false;
+        CVARS_GET("allow_steam_client", allowSteamClient);
+        if (allowSteamClient)
+            m_steamClient->Connect();
+
         m_pGUI->SelectInputHandlers(INPUT_CORE);
     }
 

Client/core/CCore.h

@@ -70,6 +70,8 @@ class CDiscordInterface;
 #define CONFIG_HISTORY_LIST_TAG    "connected_server"
 #define IDT_TIMER1                 1234
 
+class CSteamClient;
+
 extern class CCore*         g_pCore;
 extern class CGraphics*     g_pGraphics;
 extern class CLocalization* g_pLocalization;
@@ -104,6 +106,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CWebCoreInterface*                 GetWebCore();
     CTrayIconInterface*                GetTrayIcon() { return m_pTrayIcon; };
     std::shared_ptr<CDiscordInterface> GetDiscord();
+    CSteamClient*                      GetSteamClient() { return m_steamClient.get(); }
 
     void SaveConfig(bool bWaitUntilFinished = false);
 
@@ -311,6 +314,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CClientVariables                      m_ClientVariables;
     CWebCoreInterface*                    m_pWebCore = nullptr;
     CTrayIcon*                            m_pTrayIcon;
+    std::unique_ptr<CSteamClient>         m_steamClient;
     std::shared_ptr<CDiscordRichPresence> m_pDiscordRichPresence;
 
     // Hook interfaces.

Client/core/CSettings.cpp

@@ -13,6 +13,7 @@
 #include <core/CClientCommands.h>
 #include <game/CGame.h>
 #include <game/CSettings.h>
+#include "CSteamClient.h"
 
 using namespace std;
 
@@ -405,6 +406,11 @@ void CSettings::CreateGUI()
     m_pCheckBoxAllowDiscordRPC->GetPosition(vecTemp, false);
     m_pCheckBoxAllowDiscordRPC->AutoSize(NULL, 20.0f);
 
+    m_pCheckBoxAllowSteamClient = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabMultiplayer, _("Allow GTA:SA ingame status on Steam"), false));
+    m_pCheckBoxAllowSteamClient->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 20.0f));
+    m_pCheckBoxAllowSteamClient->GetPosition(vecTemp, false);
+    m_pCheckBoxAllowSteamClient->AutoSize(NULL, 20.0f);
+
     // Enable camera photos getting saved to documents folder
     m_pPhotoSavingCheckbox = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabMultiplayer, _("Save photos taken by camera weapon to GTA San Andreas User Files folder"), true));
     m_pPhotoSavingCheckbox->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 20.0f));
@@ -3085,6 +3091,14 @@ void CSettings::LoadData()
     CVARS_GET("allow_discord_rpc", bAllowDiscordRPC);
     m_pCheckBoxAllowDiscordRPC->SetSelected(bAllowDiscordRPC);
 
+    // Allow connecting with the local Steam client
+    bool allowSteamClient = false;
+    CVARS_GET("allow_steam_client", allowSteamClient);
+    m_pCheckBoxAllowSteamClient->SetSelected(allowSteamClient);
+
+    if (allowSteamClient)
+        g_pCore->GetSteamClient()->Connect();
+
     bool bAskBeforeDisconnect;
     CVARS_GET("ask_before_disconnect", bAskBeforeDisconnect);
     m_pCheckBoxAskBeforeDisconnect->SetSelected(bAskBeforeDisconnect);
@@ -3566,6 +3580,12 @@ void CSettings::SaveData()
         }
     }
 
+    // Allow connecting with the local Steam client
+    bool allowSteamClient = m_pCheckBoxAllowSteamClient->GetSelected();
+    CVARS_SET("allow_steam_client", allowSteamClient);
+    if (allowSteamClient)
+        g_pCore->GetSteamClient()->Connect();
+
     bool bAskBeforeDisconnect = m_pCheckBoxAskBeforeDisconnect->GetSelected();
     CVARS_SET("ask_before_disconnect", bAskBeforeDisconnect);
 

Client/core/CSettings.h

@@ -158,6 +158,7 @@ class CSettings
     CGUICheckBox*  m_pCheckBoxAllowExternalSounds;
     CGUICheckBox*  m_pCheckBoxCustomizedSAFiles;
     CGUICheckBox*  m_pCheckBoxAllowDiscordRPC;
+    CGUICheckBox*  m_pCheckBoxAllowSteamClient = nullptr;
     CGUICheckBox*  m_pCheckBoxAlwaysShowTransferBox;
     CGUICheckBox*  m_pCheckBoxGrass;
     CGUICheckBox*  m_pCheckBoxHeatHaze;