Merge branch 'master' into next

Author: patrikjuvonen

.github/workflows/rebuild-pots.yaml

@@ -65,19 +65,17 @@ jobs:
             git commit -m "Update installer en_US pot"
           fi
 
-          echo "::echo::on"
-
           # Check for local commits
           if [[ $(git diff --name-only "@{upstream}..") ]]
           then
-            echo "::set-output name=has_changes::true"
+            echo "has_changes=true" >> $GITHUB_ENV
           else
-            echo "::set-output name=has_changes::false"
+            echo "has_changes=false" >> $GITHUB_ENV
           fi
 
           # Get rid of all other changes
           git checkout -- .
           git clean -fd
-      - if: ${{ steps.stage_changes.outputs.has_changes == 'true' }}
+      - if: ${{ env.has_changes == 'true' }}
         name: Push changes
         run: git push

.github/workflows/stale.yaml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: multitheftauto/stale-action@v1.0.3
+      - uses: multitheftauto/stale-action@v3.0.0
         id: stale
         with:
           close-pr-message: "This draft pull request was closed because it has been marked stale for 30 days with no activity."

Client/ceflauncher_DLL/Main.cpp

@@ -9,6 +9,7 @@
  *****************************************************************************/
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#include <delayimp.h>
 #include "CCefApp.h"
 #include <string>
 #include <cef3/cef/include/cef_sandbox_win.h>
@@ -30,6 +31,9 @@ int _declspec(dllexport) InitCEF()
     std::wstring mtaPath = currentFileName.substr(0, pos - 3);            // Strip "CEF"
     SetDllDirectory(mtaPath.c_str());
 
+    // Load libcef.dll from the DLL directory
+    assert(SUCCEEDED(__HrLoadAllImportsForDll("libcef.dll")));
+
     // Load CEF
     CefMainArgs        mainArgs(GetModuleHandle(NULL));
     CefRefPtr<CCefApp> app{new CCefApp};

Client/ceflauncher_DLL/premake5.lua

@@ -22,7 +22,8 @@ project "CEFLauncher DLL"
 		"*.cpp"
 	}
 
-	links { "CEF",  "libcef.lib", "Psapi.lib", "version.lib", "Winmm.lib", "Ws2_32.lib", "DbgHelp.lib" }
+	links { "delayimp", "CEF",  "libcef.lib", "Psapi.lib", "version.lib", "Winmm.lib", "Ws2_32.lib", "DbgHelp.lib" }
+	linkoptions { "/DELAYLOAD:libcef.dll" }
 
 	filter "architecture:not x86"
 		flags { "ExcludeFromBuild" }

Client/core/CChat.cpp

@@ -745,6 +745,40 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
             if (m_strLastPlayerName.size() != 0)
                 m_strLastPlayerName.clear();
 
+            if (KeyboardArgs.codepoint == 127)            // "delete" char, used to remove the previous word from input
+            {
+                if (m_strInputText.size() > 0)
+                {
+                    // Convert our string to UTF8 before resizing, then back to ANSI.
+                    std::wstring      wstrText = MbUTF8ToUTF16(m_strInputText);
+                    std::wstring_view wstrTextView = wstrText;
+
+                    if (wstrTextView.back() == L' ' || wstrTextView.back() == L'-')
+                    {
+                        size_t lastPos = wstrTextView.find_last_not_of(wstrTextView.back());
+                        if (lastPos != std::string::npos)
+                            wstrTextView.remove_suffix(wstrTextView.size() - lastPos);
+                        else
+                            wstrText.clear();
+                    }
+
+                    size_t lastSpacePos = wstrTextView.find_last_of(L' ');
+                    size_t lastDashPos = wstrTextView.find_last_of(L'-');
+                    size_t lastPos = lastSpacePos;
+
+                    if ((lastSpacePos == std::string::npos || lastDashPos > lastSpacePos) && lastDashPos != std::string::npos)
+                        lastPos = lastDashPos;
+
+                    if (lastPos != std::string::npos)
+                        wstrText.resize(lastPos + 1);
+                    else
+                        wstrText.clear();
+
+                    SetInputText(UTF16ToMbUTF8(wstrText).c_str());
+                }
+                break;
+            }
+
             // If we haven't exceeded the maximum number of characters per chat message, append the char to the message and update the input control
             if (MbUTF8ToUTF16(m_strInputText).size() < m_iCharacterLimit)
             {

Client/core/CClientVariables.h

@@ -77,6 +77,12 @@ class CClientVariables : public CCVarsInterface, public CSingleton<CClientVariab
         m_iRevision++;
         Node(strVariable)->SetTagContent(val);
     };
+    void Set(const std::string& strVariable, const char* val)
+    {
+        SAN;
+        m_iRevision++;
+        Node(strVariable)->SetTagContent(val);
+    };
     void Set(const std::string& strVariable, const std::string& val)
     {
         SAN;

Client/core/CCore.cpp

@@ -18,6 +18,8 @@
 #define ALLOC_STATS_MODULE_NAME "core"
 #include "SharedUtil.hpp"
 #include <clocale>
+#include "DXHook/CDirect3DHook9.h"
+#include "DXHook/CDirect3DHookManager.h"
 #include "CTimingCheckpoints.hpp"
 #include "CModelCacheManager.h"
 #include <SharedUtil.Detours.h>
@@ -1467,7 +1469,22 @@ void CCore::ParseCommandLine(std::map<std::string, std::string>& options, const
     }
 
     const char* szCmdLine = GetCommandLine();
-    char        szCmdLineCopy[512];
+
+    // Skip the leading game executable path (starts and ends with a quotation mark).
+    if (szCmdLine[0] == '"')
+    {
+        if (const char* afterPath = strchr(szCmdLine + 1, '"'); afterPath != nullptr)
+        {
+            ++afterPath;
+
+            while (*afterPath && isspace(*afterPath))
+                ++afterPath;
+
+            szCmdLine = afterPath;
+        }
+    }
+    
+    char szCmdLineCopy[512];
     STRNCPY(szCmdLineCopy, szCmdLine, sizeof(szCmdLineCopy));
 
     char*       pCmdLineEnd = szCmdLineCopy + strlen(szCmdLineCopy);
@@ -1729,6 +1746,21 @@ void CCore::ApplyCoreInitSettings()
         SetProcessDPIAware();
     }
 #endif
+
+    if (int revision = GetApplicationSettingInt("reset-settings-revision"); revision < 21486)
+    {
+        // Force users with default skin to the 2023 version by replacing "Default" with "Default 2023".
+        // The GUI skin "Default 2023" was introduced in commit 2d9e03324b07e355031ecb3263477477f1a91399.
+        std::string currentSkinName;
+        CVARS_GET("current_skin", currentSkinName);
+
+        if (currentSkinName == "Default")
+        {
+            CVARS_SET("current_skin", "Default 2023");
+        }
+
+        SetApplicationSettingInt("reset-settings-revision", 21486);
+    }
 }
 
 //

Client/core/CCredits.cpp

@@ -124,7 +124,6 @@ CCredits::CCredits()
         "Philip \"Fenix\" Farquharson\n"
         "Seweryn \"Neproify\" Figura\n"
         "Alejandro \"AlexTMjugador\" González\n"
-        "Adrian \"AGraber\" Graber\n"
         "Kevin \"ciber96\" Gross\n"
         "Robin \"robhol\" Holm\n"
         "Bob \"NanoBob\" van Hooff\n"

Client/core/CFilePathTranslator.cpp

@@ -1,17 +1,19 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        core/CFilePathTranslator.cpp
+ *  FILE:        Client/core/CFilePathTranslator.cpp
  *  PURPOSE:     Easy interface to file paths
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 
 #include "StdInc.h"
+#include "CFilePathTranslator.h"
+#include <filesystem>
 
-using std::string;
+extern std::filesystem::path g_gtaDirectory;
 
 CFilePathTranslator::CFilePathTranslator()
 {
@@ -21,7 +23,7 @@ CFilePathTranslator::~CFilePathTranslator()
 {
 }
 
-bool CFilePathTranslator::GetFileFromModPath(const string& FileToGet, string& TranslatedFilePathOut)
+bool CFilePathTranslator::GetFileFromModPath(const std::string& FileToGet, std::string& TranslatedFilePathOut)
 {
     // Translate the path to this file.
     TranslatedFilePathOut = m_ModPath;
@@ -31,7 +33,7 @@ bool CFilePathTranslator::GetFileFromModPath(const string& FileToGet, string& Tr
     return true;
 }
 
-bool CFilePathTranslator::GetFileFromWorkingDirectory(const string& FileToGet, string& TranslatedFilePathOut)
+bool CFilePathTranslator::GetFileFromWorkingDirectory(const std::string& FileToGet, std::string& TranslatedFilePathOut)
 {
     // Translate the path to this file.
     TranslatedFilePathOut = m_WorkingDirectory;
@@ -41,21 +43,21 @@ bool CFilePathTranslator::GetFileFromWorkingDirectory(const string& FileToGet, s
     return true;
 }
 
-void CFilePathTranslator::GetModPath(string& ModPathOut)
+void CFilePathTranslator::GetModPath(std::string& ModPathOut)
 {
     ModPathOut = m_ModPath;
 }
 
-void CFilePathTranslator::SetModPath(const string& PathBasedOffWorkingDirectory)
+void CFilePathTranslator::SetModPath(const std::string& PathBasedOffWorkingDirectory)
 {
     m_ModPath = m_WorkingDirectory;
     m_ModPath += '\\';
     m_ModPath += PathBasedOffWorkingDirectory;
 }
 
-void CFilePathTranslator::SetCurrentWorkingDirectory(const string& PathBasedOffModuleRoot)
+void CFilePathTranslator::SetCurrentWorkingDirectory(const std::string& PathBasedOffModuleRoot)
 {
-    string RootDirectory;
+    std::string RootDirectory;
 
     // Get the root directory.
     GetMTASARootDirectory(RootDirectory);
@@ -71,17 +73,17 @@ void CFilePathTranslator::UnSetCurrentWorkingDirectory()
     m_WorkingDirectory = "";
 }
 
-void CFilePathTranslator::GetCurrentWorkingDirectory(string& WorkingDirectoryOut)
+void CFilePathTranslator::GetCurrentWorkingDirectory(std::string& WorkingDirectoryOut)
 {
     WorkingDirectoryOut = m_WorkingDirectory;
 }
 
-void CFilePathTranslator::GetGTARootDirectory(string& ModuleRootDirOut)
+void CFilePathTranslator::GetGTARootDirectory(std::string& ModuleRootDirOut)
 {
-    ModuleRootDirOut = GetLaunchPath();
+    ModuleRootDirOut = g_gtaDirectory.u8string();
 }
 
-void CFilePathTranslator::GetMTASARootDirectory(string& InstallRootDirOut)
+void CFilePathTranslator::GetMTASARootDirectory(std::string& InstallRootDirOut)
 {
     InstallRootDirOut = GetMTASABaseDir();
 }

Client/core/CFilePathTranslator.h

@@ -1,11 +1,11 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        core/CFilePathTranslator.h
+ *  FILE:        Client/core/CFilePathTranslator.h
  *  PURPOSE:     Header file for file path translator class
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 

Client/core/CGUI.cpp

@@ -24,7 +24,7 @@ CLocalGUI* CSingleton<CLocalGUI>::m_pSingleton = NULL;
 #endif
 #define GET_WHEEL_DELTA_WPARAM(wParam)  ((short)HIWORD(wParam))
 
-const char* const DEFAULT_SKIN_NAME = "Default";            // TODO: Change to whatever the default skin is if it changes
+const char* const DEFAULT_SKIN_NAME = "Default 2023";            // TODO: Change to whatever the default skin is if it changes
 
 CLocalGUI::CLocalGUI()
 {

Client/core/CGUI.h

@@ -24,7 +24,6 @@ class CLocalGUI;
 #include <gui/CGUI.h>
 
 #include "CConsole.h"
-#include "CFilePathTranslator.h"
 #include "CMainMenu.h"
 #include "CSetCursorPosHook.h"
 #include "CSingleton.h"

Client/core/CKeyBinds.cpp

@@ -2014,6 +2014,9 @@ void CKeyBinds::DoPostFramePulse()
     {
         for (const KeyBindPtr& bind : m_binds)
         {
+            if (bind->isBeingDeleted || !bind->boundKey)
+                continue;
+
             switch (bind->type)
             {
                 case KeyBindType::COMMAND:

Client/core/CMessageLoopHook.cpp

@@ -185,6 +185,13 @@ LRESULT CALLBACK CMessageLoopHook::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM w
             return 0;
     }
 
+    // Disable the system context menu by clicking on window bar (freezes the game).
+    // Disable right mouse button outside application window area (holding it over window bar freezes the game).
+    if (uMsg == WM_CONTEXTMENU || uMsg == WM_NCRBUTTONDOWN)
+    {
+        return 0;
+    }
+
     // Quit message?
     if (uMsg == WM_CLOSE)
     {
@@ -546,7 +553,7 @@ void CMessageLoopHook::StartWindowMovement()
 
     LONG lExStyle = GetWindowLong(m_MovementDummyWindow, GWL_EXSTYLE);
     lExStyle &= ~(WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE);
-    lExStyle |= WS_EX_LAYERED;
+    lExStyle |= WS_EX_LAYERED | WS_EX_TOOLWINDOW;
     SetWindowLong(m_MovementDummyWindow, GWL_EXSTYLE, lExStyle);
     SetLayeredWindowAttributes(m_MovementDummyWindow, 0, 140, LWA_ALPHA);
 

Client/core/CModManager.cpp

@@ -1,15 +1,17 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        core/CModManager.cpp
+ *  FILE:        Client/core/CModManager.cpp
  *  PURPOSE:     Game mod loading manager
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 
 #include "StdInc.h"
+#include "CModManager.h"
+#include "CFilePathTranslator.h"
 #include <game/CGame.h>
 #define DECLARE_PROFILER_SECTION_CModManager
 #include "profiler/SharedUtil.Profiler.h"

Client/core/CModManager.h

@@ -1,11 +1,11 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        core/CModManager.h
+ *  FILE:        Client/core/CModManager.h
  *  PURPOSE:     Header file for game mod manager class
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/