Add C++20 support for Client

Client/ceflauncher/premake5.lua

@@ -3,6 +3,9 @@ project "CEFLauncher"
 	kind "WindowedApp"
 	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

@@ -81,41 +81,37 @@ bool CCommands::Execute(const char* szCommandLine)
     return Execute(strCmd.c_str(), strCmdLine.c_str());
 }
 
-bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool bHandleRemotely, bool bIsScriptedBind)
+bool CCommands::Execute(const char* command, const char* parametersIn, bool handleRemotely, bool isScriptedBind)
 {
     // Copy szParametersIn so the contents can be changed
-    char* szParameters = NULL;
-    if (szParametersIn)
-    {
-        size_t sizeParameters = strlen(szParametersIn) + 1;
-        szParameters = static_cast<char*>(alloca(sizeParameters));
-        memcpy(szParameters, szParametersIn, sizeParameters);
-    }
+    std::string parameters(parametersIn ? parametersIn : "");
 
     // HACK: if its a 'chatboxsay' command, use the next parameter
     // Is the command "say" and the arguments start with /? (command comes from the chatbox)
-    if (!bIsScriptedBind && !stricmp(szCommand, "chatboxsay"))
+    if (!handleRemotely && !stricmp(command, "chatboxsay"))
     {
-        if (szParameters)
+        if (!parameters.empty())
         {
             // His line starts with '/'?
-            if (*szParameters == '/')
+            if (parameters[0] == '/')
             {
                 // Copy the characters after the slash to the 0 terminator to a seperate buffer
-                char szBuffer[256];
-                strncpy(szBuffer, szParameters + 1, 256);
-                szBuffer[255] = 0;
+                std::array<char, 256> buffer = {};
+                std::strncpy(buffer.data(), parameters.c_str() + 1, buffer.size() - 1);
+                buffer.back() = '\0';
 
                 // Split it into command and arguments
-                szCommand = strtok(szBuffer, " ");
-                szParameters = strtok(NULL, "\0");
-                if (szCommand == NULL)
-                {
+                command = std::strtok(buffer.data(), " ");
+                if (!command)
                     return false;
+
+                if (char* newParameters = std::strtok(nullptr, "\0"))
+                {
+                    parameters = std::string(newParameters);
                 }
-                if (szParameters == NULL)
+                else
                 {
-                    szParameters = "";
+                    parameters.clear();
                 }
             }
         }
@@ -124,30 +120,30 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
     }
 
     // Grab the command
-    tagCOMMANDENTRY* pEntry = Get(szCommand);
-    bool             wasHandled = false;
-    if (pEntry)
+    const tagCOMMANDENTRY* entry = Get(command);
+    bool                   wasHandled = false;
+
+    // If its a core command, or if its enabled
+    if (entry && (!entry->bModCommand || entry->bEnabled))
     {
-        // If its a core command, or if its enabled
-        if (!pEntry->bModCommand || pEntry->bEnabled)
-        {
-            // Execute it
-            if (!bIsScriptedBind || pEntry->bAllowScriptedBind)
-                ExecuteHandler(pEntry->pfnCmdFunc, szParameters);
+        // Execute it
+        if (!isScriptedBind || entry->bAllowScriptedBind)
+            ExecuteHandler(entry->pfnCmdFunc, parameters.c_str());
 
-            wasHandled = true;
-        }
+        wasHandled = true;
     }
 
     // Recompose the original command text
-    std::string val = std::string(szCommand) + " " + std::string(szParameters ? szParameters : "");
+    std::string val = command;
+    val += " ";
+    val += parameters;
 
     // Is it a cvar? (syntax: cvar[ = value])
     if (!wasHandled)
     {
         // Check to see if '=' exists
-        unsigned int nOpIndex = val.find('=');
-        std::string  key = val.substr(0, nOpIndex);
+        std::size_t nOpIndex = val.find('=');
+        std::string key = val.substr(0, nOpIndex);
 
         // Check to see if ' =' exists
         if (val.find(" =") != std::string::npos)
@@ -158,7 +154,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
         TrimWhiteSpace(key);
 
         // Handle the cvar if it exists
-        if (CClientVariables::GetSingleton().Exists(key) && !bIsScriptedBind)
+        if (CClientVariables::GetSingleton().Exists(key) && !isScriptedBind)
         {
             std::stringstream ss;
 
@@ -184,22 +180,22 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
             }
             ss << key << " = " << val;
             val = ss.str();
-            CCore::GetSingleton().GetConsole()->Print(val.c_str());
+            CCore::GetSingleton().GetConsole()->Print(val);
             return true;
         }
     }
 
     // HACK: if its a 'nick' command, save it here
-    bool bIsNickCommand = !stricmp(szCommand, "nick");
-    if (!wasHandled && bIsNickCommand && szParameters && !bIsScriptedBind)
+    bool isNickCommand = !stricmp(command, "nick");
+    if (!wasHandled && isNickCommand && !parameters.empty() && !isScriptedBind)
     {
-        if (CCore::GetSingleton().IsValidNick(szParameters))
+        if (CCore::GetSingleton().IsValidNick(parameters.c_str()))
         {
-            CVARS_SET("nick", std::string(szParameters));
+            CVARS_SET("nick", parameters);
 
             if (!CCore::GetSingleton().IsConnected())
             {
-                CCore::GetSingleton().GetConsole()->Printf("nick: You are now known as %s", szParameters);
+                CCore::GetSingleton().GetConsole()->Print(std::format("nick: You are now known as {}", parameters));
             }
         }
         else if (!CCore::GetSingleton().IsConnected())
@@ -211,18 +207,19 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
     // Try to execute the handler
     if (m_pfnExecuteHandler)
     {
-        bool bAllowScriptedBind = (!pEntry || pEntry->bAllowScriptedBind);
-        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, wasHandled, bIsScriptedBind, bAllowScriptedBind))
+        bool bAllowScriptedBind = (!entry || entry->bAllowScriptedBind);
+        if (m_pfnExecuteHandler(command, parameters.c_str(), handleRemotely, wasHandled, isScriptedBind, bAllowScriptedBind))
             return true;
     }
 
     if (wasHandled)
         return true;
 
     // Unknown command
-    val = _("Unknown command or cvar: ") + szCommand;
-    if (!bIsScriptedBind && !bIsNickCommand && pEntry == nullptr)
-        CCore::GetSingleton().GetConsole()->Print(val.c_str());
+    val = _("Unknown command or cvar: ") + command;
+    if (!isScriptedBind && !isNickCommand && !entry)
+        CCore::GetSingleton().GetConsole()->Print(val);
+
     return false;
 }
 

Client/core/CCommands.h

@@ -27,7 +27,7 @@ class CCommands : public CCommandsInterface, public CSingleton<CCommands>
     bool         Exists(const char* szCommand);
 
     bool Execute(const char* szCommandLine);
-    bool Execute(const char* szCommand, const char* szParameters, bool bHandleRemotely = false, bool bIsScriptedBind = false);
+    bool Execute(const char* command, const char* parametersIn, bool handleRemotely = false, bool isScriptedBind = false);
 
     void Delete(const char* szCommand);
     void DeleteAll();

Client/core/CConsole.cpp

@@ -64,10 +64,10 @@ CConsole::~CConsole()
     delete m_pConsoleHistory;
 }
 
-void CConsole::Echo(const char* szText)
+void CConsole::Echo(const char* text)
 {
     // Add to add buffer
-    m_strPendingAdd += szText;
+    m_strPendingAdd += text;
     if (!m_strPendingAdd.EndsWith("\n"))
         m_strPendingAdd += "\n";
 
@@ -83,27 +83,54 @@ void CConsole::Echo(const char* szText)
     if (m_pWindow->IsVisible())
         FlushPendingAdd();
 
-    CConsoleLogger::GetSingleton().LinePrintf("[Output] : %s", szText);
+    CConsoleLogger::GetSingleton().LinePrintf("[Output] : %s", text);
 }
 
-void CConsole::Print(const char* szText)
+void CConsole::Echo(const std::string& text)
 {
-    Echo(szText);
+    // Add to add buffer
+    m_strPendingAdd += text;
+    if (!m_strPendingAdd.EndsWith("\n"))
+        m_strPendingAdd += "\n";
+
+    // Trim add buffer
+    if (m_strPendingAdd.length() > CONSOLE_SIZE)
+    {
+        m_strPendingAdd = m_strPendingAdd.Right(CONSOLE_SIZE);
+        m_strPendingAdd = m_strPendingAdd.SplitRight("\n");
+        m_pHistory->SetText("");
+    }
+
+    // Flush add buffer is window is visible
+    if (m_pWindow->IsVisible())
+        FlushPendingAdd();
+
+    CConsoleLogger::GetSingleton().WriteLine("[Output] : " + text);
 }
 
-void CConsole::Printf(const char* szFormat, ...)
+void CConsole::Print(const char* text)
+{
+    Echo(text);
+}
+
+void CConsole::Printf(const char* format, ...)
 {
     // Parse the formatted string to a string we can echo
     char    szBuffer[1024];
     va_list ap;
-    va_start(ap, szFormat);
-    VSNPRINTF(szBuffer, 1024, szFormat, ap);
+    va_start(ap, format);
+    VSNPRINTF(szBuffer, 1024, format, ap);
     va_end(ap);
 
     // Echo it
     Echo(szBuffer);
 }
 
+void CConsole::Print(const std::string& text)
+{
+    Echo(text);
+}
+
 void CConsole::Clear()
 {
     // Clear the history buffer.

Client/core/CConsole.h

@@ -25,9 +25,12 @@ class CConsole : public CConsoleInterface
     CConsole(CGUI* pManager, CGUIElement* pParent = NULL);
     ~CConsole();
 
-    void Echo(const char* szText);
-    void Print(const char* szText);
-    void Printf(const char* szFormat, ...);
+    void Echo(const char* text);
+    void Echo(const std::string& text);
+
+    void Print(const char* text);
+    void Printf(const char* format, ...);
+    void Print(const std::string& text);
 
     void Clear();
 

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(PathToUtf8(inLaunchDir).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(PathToUtf8(inGTADir).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 = PathToUtf8(g_gtaDirectory);
 }
 
 void CFilePathTranslator::GetMTASARootDirectory(std::string& InstallRootDirOut)

Client/core/CKeyBinds.cpp

@@ -2301,7 +2301,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);
@@ -2384,7 +2384,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 : SString();
         }
         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; }