Add C++20 support for Client

Client/ceflauncher/premake5.lua

@@ -4,6 +4,8 @@ project "CEFLauncher"
 	targetname "CEFLauncher"
 	targetdir(buildpath("mta/cef"))
 
+	cppdialect "C++20"
+
 	includedirs { "../sdk" }
 
 	links { "CEFLauncher DLL"}

Client/ceflauncher_DLL/premake5.lua

@@ -4,6 +4,8 @@ project "CEFLauncher DLL"
 	targetname "CEFLauncher_DLL"
 	targetdir(buildpath("mta/cef"))
 
+	cppdialect "C++20"
+
 	includedirs { "../../vendor/cef3/cef" }
 	libdirs { "../../vendor/cef3/cef/Release" }
 

Client/cefweb/premake5.lua

@@ -4,6 +4,8 @@ project "Client Webbrowser"
 	targetname "cefweb"
 	targetdir(buildpath("mta"))
 
+    cppdialect "C++20"
+
 	filter "system:windows"
 		includedirs { "../../vendor/sparsehash/src/windows" }
 		linkoptions { "/SAFESEH:NO" }

Client/core/CAdditionalVertexStreamManager.cpp

@@ -466,13 +466,13 @@ SAdditionalStreamInfo* CAdditionalVertexStreamManager::CreateAdditionalStreamInf
         declNew->Usage = D3DDECLUSAGE_NORMAL;
         declNew->UsageIndex = 0;
         if (FAILED(m_pDevice->CreateVertexDeclaration(elements, &info.pVertexDeclaration)))
-            return false;
+            return nullptr;
 
         // Create new stream
         info.Stride = sizeof(float) * 3;
         UINT Size2 = ConvertPTSize(state.decl.VertexBufferDesc1.Size);
         if (FAILED(m_pDevice->CreateVertexBuffer(Size2, D3DUSAGE_WRITEONLY, 0, D3DPOOL_MANAGED, &info.pStreamData, NULL)))
-            return false;
+            return nullptr;
 
         // Save info
         MapSet(m_AdditionalStreamInfoMap, state.stream1.pStreamData, info);

Client/core/CCommands.cpp

@@ -84,12 +84,11 @@ bool CCommands::Execute(const char* szCommandLine)
 bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool bHandleRemotely, bool bIsScriptedBind)
 {
     // Copy szParametersIn so the contents can be changed
-    char* szParameters = NULL;
+    char* szParameters = nullptr;
     if (szParametersIn)
     {
-        size_t sizeParameters = strlen(szParametersIn) + 1;
-        szParameters = static_cast<char*>(alloca(sizeParameters));
-        memcpy(szParameters, szParametersIn, sizeParameters);
+        szParameters = static_cast<char*>(alloca(strlen(szParametersIn) + 1));
+        std::strcpy(szParameters, szParametersIn);
     }
 
     // HACK: if its a 'chatboxsay' command, use the next parameter
@@ -108,15 +107,12 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
                 // Split it into command and arguments
                 szCommand = strtok(szBuffer, " ");
-                szParameters = strtok(NULL, "\0");
-                if (szCommand == NULL)
-                {
+                szParameters = strtok(nullptr, "\0");
+                if (!szCommand)
                     return false;
-                }
-                if (szParameters == NULL)
-                {
-                    szParameters = "";
-                }
+
+                if (!szParameters)
+                    std::strcpy(szParameters, "");
             }
         }
         else

Client/core/CCore.cpp

@@ -60,13 +60,13 @@ static HMODULE WINAPI SkipDirectPlay_LoadLibraryA(LPCSTR fileName)
         const fs::path inLaunchDir = fs::path{FromUTF8(GetLaunchPath())} / "enbseries" / "enbhelper.dll";
 
         if (fs::is_regular_file(inLaunchDir, ec))
-            return Win32LoadLibraryA(inLaunchDir.u8string().c_str());
+            return Win32LoadLibraryA(inLaunchDir.string().c_str());
 
         // Try to load enbhelper.dll from the GTA install directory second.
         const fs::path inGTADir = g_gtaDirectory / "enbseries" / "enbhelper.dll";
 
         if (fs::is_regular_file(inGTADir, ec))
-            return Win32LoadLibraryA(inGTADir.u8string().c_str());
+            return Win32LoadLibraryA(inGTADir.string().c_str());
 
         return nullptr;
     }

Client/core/CEntryHistory.h

@@ -66,7 +66,7 @@ class CEntryHistory
     // Return a specific entry from history
     CEntryHistoryItem* Get(unsigned int index)
     {
-        auto& iter = std::next(m_entries.begin(), index);
+        auto iter = std::next(m_entries.begin(), index);
         if (iter != m_entries.end())
             return &(*iter);
         return nullptr;

Client/core/CFilePathTranslator.cpp

@@ -80,7 +80,7 @@ void CFilePathTranslator::GetCurrentWorkingDirectory(std::string& WorkingDirecto
 
 void CFilePathTranslator::GetGTARootDirectory(std::string& ModuleRootDirOut)
 {
-    ModuleRootDirOut = g_gtaDirectory.u8string();
+    ModuleRootDirOut = g_gtaDirectory.string();
 }
 
 void CFilePathTranslator::GetMTASARootDirectory(std::string& InstallRootDirOut)

Client/core/CKeyBinds.cpp

@@ -2300,7 +2300,7 @@ void CKeyBinds::BindCommand(const char* szCmdLine)
 {
     CConsoleInterface* pConsole = m_pCore->GetConsole();
 
-    char* szError = "* Syntax: bind <defaults/key> [<up/down>] <command> [<arguments>]";
+    const char* szError = "* Syntax: bind <defaults/key> [<up/down>] <command> [<arguments>]";
     if (szCmdLine == NULL)
     {
         pConsole->Print(szError);
@@ -2383,7 +2383,7 @@ void CKeyBinds::UnbindCommand(const char* szCmdLine)
 {
     CConsoleInterface* pConsole = m_pCore->GetConsole();
 
-    char* szError = "* Syntax: unbind <all/key> [<up/down/both> <command>]";
+    const char* szError = "* Syntax: unbind <all/key> [<up/down/both> <command>]";
     if (szCmdLine == NULL)
     {
         pConsole->Print(szError);

Client/core/CVersionUpdater.Util.hpp

@@ -391,7 +391,7 @@ namespace
         SString                    GetAttribute(const SString& strName) const
         {
             const SString* pValue = MapFind(attributeMap, strName);
-            return pValue ? *pValue : "";
+            return pValue ? *pValue : SStringX("");
         }
         void SetAttribute(const SString& strName, const SString& strValue) { MapSet(attributeMap, strName, strValue); }
     };
@@ -606,7 +606,7 @@ namespace
             SaveReportSettings();
         }
 
-        SString GetFilter() const { return strFilter != "" ? strFilter : "+all"; }
+        SString GetFilter() const { return !strFilter.empty() ? strFilter : SStringX("+all"); }
 
         int GetMinSize() const { return iMinSize; }
 

Client/core/Graphics/CRenderItem.EffectTemplate.cpp

@@ -47,7 +47,7 @@ namespace
         SString                    m_strReport;
         std::map<SString, SString> m_FileMD5Map;
 
-        CIncludeManager::CIncludeManager(const SString& strRootPath, const SString& strCurrentPath)
+        CIncludeManager(const SString& strRootPath, const SString& strCurrentPath)
         {
             m_strRootPath = strRootPath;
             m_strCurrentPath = strCurrentPath;
@@ -228,15 +228,15 @@ void CEffectTemplate::CreateUnderlyingData(const SString& strFile, const SString
     if (bDebug)
         dwFlags |= D3DXSHADER_DEBUG;
 
-    SString         strMetaPath = bIsRawData ? "" : strFile.Right(strFile.length() - strRootPath.length());
-    CIncludeManager IncludeManager(strRootPath, ExtractPath(strMetaPath));
+    const char*     szMetaPath = bIsRawData ? "" : strFile.Right(strFile.length() - strRootPath.length()).c_str();
+    CIncludeManager IncludeManager(strRootPath, ExtractPath(szMetaPath));
     LPD3DXBUFFER    pBufferErrors = NULL;
     if (bIsRawData)
         m_CreateHResult =
             MyD3DXCreateEffect(m_pDevice, strFile, strFile.length(), &macroList[0], &IncludeManager, dwFlags, NULL, &m_pD3DEffect, &pBufferErrors);
     else
         m_CreateHResult =
-            MyD3DXCreateEffectFromFile(m_pDevice, ExtractFilename(strMetaPath), &macroList[0], &IncludeManager, dwFlags, NULL, &m_pD3DEffect, &pBufferErrors);
+            MyD3DXCreateEffectFromFile(m_pDevice, ExtractFilename(szMetaPath), &macroList[0], &IncludeManager, dwFlags, NULL, &m_pD3DEffect, &pBufferErrors);
 
     // Handle compile errors
     strOutStatus = "";

Client/core/ServerBrowser/CServerBrowser.cpp

@@ -1078,21 +1078,21 @@ void CServerBrowser::AddServerToList(CServerListItem* pServer, const ServerBrows
             pServer->iRowIndex = iIndex;
         }
 
-        const SString strVersion = !bIncludeOtherVersions ? "" : pServer->strVersion;
+        const char*   szVersion = !bIncludeOtherVersions ? "" : pServer->strVersion.c_str();
         const SString strVersionSortKey = pServer->strVersionSortKey + pServer->strTieBreakSortKey;
 
-        const SString strPlayers = pServer->nMaxPlayers == 0 ? "" : SString("%d / %d", pServer->nPlayers, pServer->nMaxPlayers);
+        const char*   szPlayers = pServer->nMaxPlayers == 0 ? "" : SString("%d / %d", pServer->nPlayers, pServer->nMaxPlayers).c_str();
         const SString strPlayersSortKey = SString("%04d-", pServer->nMaxPlayers ? pServer->nPlayers + 1 : 0) + pServer->strTieBreakSortKey;
 
-        const SString strPing = pServer->nPing == 9999 ? "" : SString("%d", pServer->nPing);
+        const char*   szPing = pServer->nPing == 9999 ? "" : SString("%d", pServer->nPing).c_str();
         const SString strPingSortKey = SString("%04d-", pServer->nPing) + pServer->strTieBreakSortKey;
 
         // The row index could change at any point here if list sorting is enabled
-        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hVersion[Type], strVersion, false, false, true, strVersionSortKey);
-        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hName[Type], pServer->strName, false, false, true, pServer->strNameSortKey);
-        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hGame[Type], pServer->strGameMode, false, false, true);
-        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hPlayers[Type], strPlayers, false, false, true, strPlayersSortKey);
-        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hPing[Type], strPing, false, false, true, strPingSortKey);
+        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hVersion[Type], szVersion, false, false, true, strVersionSortKey);
+        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hName[Type], pServer->strName.c_str(), false, false, true, pServer->strNameSortKey);
+        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hGame[Type], pServer->strGameMode.c_str(), false, false, true);
+        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hPlayers[Type], szPlayers, false, false, true, strPlayersSortKey);
+        iIndex = m_pServerList[Type]->SetItemText(iIndex, m_hPing[Type], szPing, false, false, true, strPingSortKey);
 
         // Locked icon
         m_pServerList[Type]->SetItemImage(iIndex, m_hLocked[Type], pServer->bPassworded ? m_pLockedIcon : NULL);

Client/core/premake5.lua

@@ -4,6 +4,8 @@ project "Client Core"
 	targetname "core"
 	targetdir(buildpath("mta"))
 
+	cppdialect "C++20"
+
 	filter "system:windows"
 		includedirs { "../../vendor/sparsehash/src/windows" }
 		linkoptions { "/SAFESEH:NO" }

Client/game_sa/CModelInfoSA.cpp

@@ -1708,7 +1708,7 @@ void CModelInfoSA::CopyStreamingInfoFromModel(ushort usBaseModelID)
     pTargetModelStreamingInfo->sizeInBlocks = pBaseModelStreamingInfo->sizeInBlocks;
 }
 
-void CModelInfoSA::MakePedModel(char* szTexture)
+void CModelInfoSA::MakePedModel(const char* szTexture)
 {
     // Create a new CPedModelInfo
     CPedModelInfoSA pedModelInfo;

Client/game_sa/CModelInfoSA.h

@@ -444,7 +444,7 @@ class CModelInfoSA : public CModelInfo
     RwObject* GetRwObject() { return m_pInterface ? m_pInterface->pRwObject : NULL; }
 
     // CModelInfoSA methods
-    void         MakePedModel(char* szTexture);
+    void         MakePedModel(const char* szTexture);
     void         MakeObjectModel(ushort usBaseModelID);
     void         MakeVehicleAutomobile(ushort usBaseModelID);
     void         MakeTimedObjectModel(ushort usBaseModelID);

Client/game_sa/CWeaponSA.cpp

@@ -175,8 +175,11 @@ bool CWeaponSA::Fire(CEntity* pFiringEntity, CVector* pvecOrigin, CVector* pvecT
     return bReturn;
 }
 
-void CWeaponSA::AddGunshell(CEntity* pFiringEntity, CVector* pvecOrigin, CVector2D* pvecDirection, float fSize)
+void CWeaponSA::AddGunshell(CEntity* pFiringEntity, const CVector& vecOrigin, const CVector2D& vecDirection, float fSize)
 {
+    const CVector*   pvecOrigin = &vecOrigin;
+    const CVector2D* pvecDirection = &vecDirection;
+
     DWORD dwEntityInterface = 0;
     if (pFiringEntity)
         dwEntityInterface = (DWORD)pFiringEntity->GetInterface();

Client/game_sa/CWeaponSA.h

@@ -67,7 +67,7 @@ class CWeaponSA : public CWeapon
     void         Initialize(eWeaponType type, unsigned int uiAmmo, CPed* pPed);
     void         Update(CPed* pPed);
     bool         Fire(CEntity* pFiringEntity, CVector* pvecOrigin, CVector* pvecOffset, CEntity* pTargetEntity, CVector* pvec_1, CVector* pvec_2);
-    void         AddGunshell(CEntity* pFiringEntity, CVector* pvecOrigin, CVector2D* pvecDirection, float fSize);
+    void         AddGunshell(CEntity* pFiringEntity, const CVector& vecOrigin, const CVector2D& vecDirection, float fSize);
     void DoBulletImpact(CEntity* pFiringEntity, CEntitySAInterface* pEntityInterface, CVector* pvecOrigin, CVector* pvecTarget, CColPoint* pColPoint, int i_1);
     unsigned char GenerateDamageEvent(CPed* pPed, CEntity* pResponsible, eWeaponType weaponType, int iDamagePerHit, ePedPieceTypes hitZone, int i_2);
     bool ProcessLineOfSight(const CVector* vecStart, const CVector* vecEnd, CColPoint** colCollision, CEntity** CollisionEntity, const SLineOfSightFlags flags,

Client/gui/premake5.lua

@@ -4,6 +4,8 @@ project "GUI"
 	targetname "cgui"
 	targetdir(buildpath("mta"))
 
+	cppdialect "C++20"
+
 	filter "system:windows"
 		includedirs { "../../vendor/sparsehash/src/windows" }
 

Client/launch/premake5.lua

@@ -5,6 +5,8 @@ project "Client Launcher"
 	targetdir(buildpath("."))
 	debugdir(buildpath("."))
 
+	cppdialect "C++20"
+
 	includedirs {
 		"../../Shared/sdk",
 		"../sdk",

Client/loader-proxy/premake5.lua

@@ -5,6 +5,8 @@ project "Loader Proxy"
 	targetdir(buildpath("mta"))
 	targetsuffix ""
 
+	cppdialect "C++20"
+
 	vpaths {
 		["Headers/*"] = "**.h",
 		["Sources"] = { "*.cpp" },

Client/loader/CInstallManager.cpp

@@ -655,13 +655,13 @@ SString CInstallManager::_PrepareLaunchLocation()
                 if (fs::is_regular_file(sourcePath, ec))
                 {
                     SString strMessage(_("MTA:SA cannot launch because copying a file failed:"));
-                    strMessage += "\n\n" + targetPath.u8string();
+                    strMessage += "\n\n" + targetPath.string();
                     BrowseToSolution("copy-files", ASK_GO_ONLINE, strMessage);
                 }
                 else
                 {
                     SString strMessage(_("MTA:SA cannot launch because an MTA:SA file is incorrect or missing:"));
-                    strMessage += "\n\n" + sourcePath.u8string();
+                    strMessage += "\n\n" + sourcePath.string();
                     BrowseToSolution("mta-datafiles-missing", ASK_GO_ONLINE, strMessage);
                 }
 
@@ -693,15 +693,15 @@ SString CInstallManager::_ProcessGtaPatchCheck()
     if (!FileGenerator::IsPatchBase(patchBasePath))
     {
         SString strMessage(_("MTA:SA cannot launch because a GTA:SA file is incorrect or missing:"));
-        strMessage += "\n\n" + patchBasePath.u8string();
+        strMessage += "\n\n" + patchBasePath.string();
         BrowseToSolution("gengta_pakfiles", ASK_GO_ONLINE, strMessage);
         return "quit";
     }
 
     if (!FileGenerator::IsPatchDiff(patchDiffPath))
     {
         SString strMessage(_("MTA:SA cannot launch because an MTA:SA file is incorrect or missing:"));
-        strMessage += "\n\n" + patchDiffPath.u8string();
+        strMessage += "\n\n" + patchDiffPath.string();
         BrowseToSolution("mta-datafiles-missing", ASK_GO_ONLINE, strMessage);
         return "quit";
     }
@@ -771,7 +771,7 @@ SString CInstallManager::_ProcessGtaDllCheck()
         if (isAdmin)
         {
             SString strMessage(_("MTA:SA cannot launch because a GTA:SA file is incorrect or missing:"));
-            strMessage += "\n\n" + dependecyPath.u8string();
+            strMessage += "\n\n" + dependecyPath.string();
             BrowseToSolution(SString("gendep_error&name=%s", dependency.fileName), ASK_GO_ONLINE, strMessage);
             return "quit";
         }
@@ -826,7 +826,7 @@ SString CInstallManager::_ProcessGtaVersionCheck()
             if (isAdmin)
             {
                 SString strMessage(_("MTA:SA cannot launch because the GTA:SA executable is incorrect or missing:"));
-                strMessage += "\n\n" + gtaExePath.u8string();
+                strMessage += "\n\n" + gtaExePath.string();
                 strMessage +=
                     "\n\n" +
                     _("Please check your anti-virus for a false-positive detection, try to add an exception for the GTA:SA executable and restart MTA:SA.");
@@ -851,7 +851,7 @@ SString CInstallManager::_ProcessGtaVersionCheck()
             if (isAdmin)
             {
                 SString strMessage(_("MTA:SA cannot launch because the GTA:SA executable is not loadable:"));
-                strMessage += "\n\n" + gtaExePath.u8string();
+                strMessage += "\n\n" + gtaExePath.string();
                 BrowseToSolution(SString("gengta_error&code=%d", ec.value()), ASK_GO_ONLINE, strMessage);
                 return "quit";
             }
@@ -874,7 +874,7 @@ SString CInstallManager::_ProcessGtaVersionCheck()
         if (isAdmin)
         {
             SString strMessage(_("MTA:SA cannot launch because patching GTA:SA has failed:"));
-            strMessage += "\n\n" + gtaExePath.u8string();
+            strMessage += "\n\n" + gtaExePath.string();
             BrowseToSolution(SString("patchgta_error&code=%d", ec.value()), ASK_GO_ONLINE, strMessage);
             return "quit";
         }

Client/loader/Install.Manifest.cpp

@@ -63,7 +63,7 @@ static void ParseManifestVersion1(std::ifstream& manifest, std::vector<ManifestF
         {
             uint32_t checksum{};
 
-            if (auto& [ptr, ec] = std::from_chars(line.data(), line.data() + space, checksum, 16); ec == std::errc{})
+            if (const auto& [ptr, ec] = std::from_chars(line.data(), line.data() + space, checksum, 16); ec == std::errc{})
             {
                 ManifestFile file{};
                 file.relativePath = line.substr(space + 1);

Client/loader/MainFunctions.cpp

@@ -1115,7 +1115,7 @@ int LaunchGame(SString strCmdLine)
     const SString strGTAPath = GetGTAPath();
     const SString strMTASAPath = GetMTASAPath();
     SString       strMtaDir = PathJoin(strMTASAPath, "mta");
-    SString       strGTAEXEPath = GetGameExecutablePath().u8string();
+    SString       strGTAEXEPath = GetGameExecutablePath().string();
 
     SetDllDirectory(strMtaDir);
     if (!CheckService(CHECK_SERVICE_PRE_CREATE) && !IsUserAdmin())

Client/loader/Utils.cpp

@@ -572,7 +572,7 @@ ePathResult GetGamePath(SString& strOutResult, bool bFindIfMissing)
     if (strlen(pathList[0].c_str()))
     {
         // Check for replacement characters (?), to see if there are any (unsupported) unicode characters
-        if (strchr(pathList[0].c_str(), '?') > 0)
+        if (strchr(pathList[0].c_str(), '?') != nullptr)
             return GAME_PATH_UNICODE_CHARS;
     }
 

Client/loader/premake5.lua

@@ -4,6 +4,8 @@ project "Loader"
 	targetname "loader"
 	targetdir(buildpath("mta"))
 
+	cppdialect "C++20"
+
 	filter "system:windows"
 		linkoptions { "/SAFESEH:NO" }