Merge pull request #1 from multitheftauto/master

Merge master into custom_ifp_animations

Author: saml1er

Client/cefweb/CWebCore.cpp

@@ -219,7 +219,7 @@ eURLState CWebCore::GetDomainState(const SString& strURL, bool bOutputDebug)
 SString CWebCore::GetDomainFromURL(const SString& strURL)
 {
     CefURLParts urlParts;
-    if (!CefParseURL(strURL, urlParts) || !urlParts.host.str)
+    if (strURL.empty() || !CefParseURL(strURL, urlParts) || !urlParts.host.str)
         return "";
 
     return UTF16ToMbUTF8(urlParts.host.str);

Client/cefweb/CWebView.cpp

@@ -93,7 +93,7 @@ bool CWebView::LoadURL(const SString& strURL, bool bFilterEnabled, const SString
         return false;
 
     CefURLParts urlParts;
-    if (!CefParseURL(strURL, urlParts))
+    if (strURL.empty() || !CefParseURL(strURL, urlParts))
         return false;            // Invalid URL
 
     // Are we allowed to browse this website?
@@ -612,7 +612,7 @@ bool CWebView::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect)
 ////////////////////////////////////////////////////////////////////
 void CWebView::OnPopupShow(CefRefPtr<CefBrowser> browser, bool show)
 {
-    std::lock_guard<std::mutex>(m_RenderData.dataMutex);
+    std::lock_guard<std::mutex> lock{m_RenderData.dataMutex};
     m_RenderData.popupShown = show;
 
     // Free popup buffer memory if hidden
@@ -628,7 +628,7 @@ void CWebView::OnPopupShow(CefRefPtr<CefBrowser> browser, bool show)
 ////////////////////////////////////////////////////////////////////
 void CWebView::OnPopupSize(CefRefPtr<CefBrowser> browser, const CefRect& rect)
 {
-    std::lock_guard<std::mutex>(m_RenderData.dataMutex);
+    std::lock_guard<std::mutex> lock{m_RenderData.dataMutex};
 
     // Update rect
     m_RenderData.popupRect = rect;

Client/core/CChat.cpp

@@ -145,7 +145,7 @@ void CChat::LoadCVars(void)
 //
 // Draw
 //
-void CChat::Draw(bool bUseCacheTexture)
+void CChat::Draw(bool bUseCacheTexture, bool bAllowOutline)
 {
     // Are we visible?
     if (!m_bVisible)
@@ -159,9 +159,12 @@ void CChat::Draw(bool bUseCacheTexture)
         UpdateGUI();
     }
 
+    bool bUsingOutline = m_bTextBlackOutline && bAllowOutline && bUseCacheTexture;
+    DrawInputLine(bUsingOutline);
+
     // Get drawList for the chat box text
     SDrawList drawList;
-    GetDrawList(drawList);
+    GetDrawList(drawList, bUsingOutline);
 
     // Calc some size info
     CVector2D chatTopLeft(drawList.renderBounds.fX1, drawList.renderBounds.fY1);
@@ -212,6 +215,7 @@ void CChat::Draw(bool bUseCacheTexture)
     // If we can't get a rendertarget for some reason, just render the text directly to the screen
     if (!m_pCacheTexture)
     {
+        drawList.bOutline = false;            // Outline too slow without cache texture
         DrawDrawList(drawList, chatTopLeft);
         return;
     }
@@ -270,15 +274,14 @@ void CChat::DrawDrawList(const SDrawList& drawList, const CVector2D& topLeftOffs
 //
 // Get list of text lines to draw
 //
-void CChat::GetDrawList(SDrawList& outDrawList)
+void CChat::GetDrawList(SDrawList& outDrawList, bool bUsingOutline)
 {
     float     fLineDifference = CChat::GetFontHeight(m_vecScale.fY);
     CVector2D vecPosition(m_vecBackgroundPosition.fX + (5.0f * m_vecScale.fX), m_vecBackgroundPosition.fY + m_vecBackgroundSize.fY - (fLineDifference * 1.25f));
     float     fMaxLineWidth = m_vecBackgroundSize.fX - (10.0f * m_vecScale.fX);
     unsigned long ulTime = GetTickCount32();
     float         fRcpChatLineFadeOut = 1.0f / m_ulChatLineFadeOut;
-    bool          bShadow = (m_Color.A * m_fBackgroundAlpha == 0.f) && !m_bTextBlackOutline;
-    bool          bInputShadow = (m_InputColor.A * m_fInputBackgroundAlpha == 0.f) && !m_bTextBlackOutline;
+    bool          bShadow = (m_Color.A * m_fBackgroundAlpha == 0.f) && !bUsingOutline;
 
     if (m_Color.A * m_fBackgroundAlpha > 0.f)
     {
@@ -304,7 +307,7 @@ void CChat::GetDrawList(SDrawList& outDrawList)
 
     outDrawList.renderBounds = RenderBounds;
     outDrawList.bShadow = bShadow;
-    outDrawList.bOutline = m_bTextBlackOutline;
+    outDrawList.bOutline = bUsingOutline;
 
     // Smooth scroll
     int   iLineScroll;
@@ -351,7 +354,13 @@ void CChat::GetDrawList(SDrawList& outDrawList)
         if (uiLine == m_uiMostRecentLine)            // Went through all lines?
             break;
     }
+}
 
+//
+// CChat::DrawInputLine
+//
+void CChat::DrawInputLine(bool bUsingOutline)
+{
     if (m_InputColor.A * m_fInputBackgroundAlpha > 0.f)
     {
         if (m_pInput)
@@ -366,8 +375,10 @@ void CChat::GetDrawList(SDrawList& outDrawList)
 
     if (m_bInputVisible)
     {
+        float     fLineDifference = CChat::GetFontHeight(m_vecScale.fY);
+        bool      bInputShadow = (m_InputColor.A * m_fInputBackgroundAlpha == 0.f) && !bUsingOutline;
         CVector2D vecPosition(m_vecInputPosition.fX + (5.0f * m_vecScale.fX), m_vecInputPosition.fY + (fLineDifference * 0.125f));
-        m_InputLine.Draw(vecPosition, 255, bInputShadow, m_bTextBlackOutline);
+        m_InputLine.Draw(vecPosition, 255, bInputShadow, bUsingOutline);
     }
 }
 

Client/core/CChat.h

@@ -157,7 +157,7 @@ class CChat
     CChat(CGUI* pManager, const CVector2D& vecPosition);
     ~CChat(void);
 
-    virtual void Draw(bool bUseCacheTexture);
+    virtual void Draw(bool bUseCacheTexture, bool bAllowOutline);
     virtual void Output(const char* szText, bool bColorCoded = true);
     void         Clear(void);
     void         ClearInput(void);
@@ -202,7 +202,8 @@ class CChat
     void UpdatePosition(void);
     void UpdateSmoothScroll(float* pfPixelScroll, int* piLineScroll);
     void DrawDrawList(const SDrawList& drawList, const CVector2D& topLeftOffset = CVector2D(0, 0));
-    void GetDrawList(SDrawList& outDrawList);
+    void GetDrawList(SDrawList& outDrawList, bool bUsingOutline);
+    void DrawInputLine(bool bUsingOutline);
 
     CChatLine      m_Lines[CHAT_MAX_LINES];            // Circular buffer
     int            m_iScrollState;                     // 1 up, 0 stop, -1 down

Client/core/CCommandFuncs.cpp

@@ -75,7 +75,7 @@ void CCommandFuncs::Ver(const char* szParameters)
     if (usNetRel > 0)
         strVersion += SString(".%03d", usNetRel);
     strVersion += "\n";
-    strVersion += _(BLUE_COPYRIGHT_STRING);
+    strVersion += g_pCore->GetBlueCopyrightString();
     CLocalGUI::GetSingleton().EchoConsole(strVersion);
 }
 

Client/core/CCommands.cpp

@@ -207,7 +207,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // Unknown command
     val = _("Unknown command or cvar: ") + szCommand;
-    if (!bIsScriptedBind && !bIsNickCommand)
+    if (!bIsScriptedBind && !bIsNickCommand && pEntry == nullptr)
         CCore::GetSingleton().GetConsole()->Print(val.c_str());
     return false;
 }

Client/core/CCore.cpp

@@ -1870,12 +1870,12 @@ void CCore::OnDeviceRestore(void)
 void CCore::OnPreFxRender(void)
 {
     // Don't do nothing if nothing won't be drawn
-    if (!CGraphics::GetSingleton().HasMaterialLine3DQueueItems())
+    if (!CGraphics::GetSingleton().HasLine3DPreGUIQueueItems())
         return;
 
     CGraphics::GetSingleton().EnteringMTARenderZone();
 
-    CGraphics::GetSingleton().DrawMaterialLine3DQueue();
+    CGraphics::GetSingleton().DrawLine3DPreGUIQueue();
 
     CGraphics::GetSingleton().LeavingMTARenderZone();
 }
@@ -2243,3 +2243,9 @@ bool CCore::GetRightSizeTxdEnabled(void)
 
     return false;
 }
+
+SString CCore::GetBlueCopyrightString(void)
+{
+    SString strCopyright = BLUE_COPYRIGHT_STRING;
+    return strCopyright.Replace("%BUILD_YEAR%", std::to_string(BUILD_YEAR).c_str());
+}

Client/core/CCore.h

@@ -46,7 +46,7 @@ class CCore;
 #include <dinput.h>
 
 #define BLUE_VERSION_STRING     "Multi Theft Auto v" MTA_DM_BUILDTAG_LONG
-#define BLUE_COPYRIGHT_STRING    _td("Copyright (C) 2003 - 2018 Multi Theft Auto")
+#define BLUE_COPYRIGHT_STRING   "Copyright (C) 2003 - %BUILD_YEAR% Multi Theft Auto"
 
 // Configuration file path (relative to MTA install directory)
 #define MTA_CONFIG_PATH             "mta/config/coreconfig.xml"
@@ -272,6 +272,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     const char* GetProductVersion(void) { return SharedUtil::GetProductVersion(); }
     void        SetFakeLagCommandEnabled(bool bEnabled) { m_bFakeLagCommandEnabled = bEnabled; }
     bool        IsFakeLagCommandEnabled(void) { return m_bFakeLagCommandEnabled; }
+    SString     GetBlueCopyrightString(void);
 
 private:
     // Core devices.

Client/core/CCredits.cpp

@@ -47,7 +47,7 @@ CCredits::CCredits(void)
         L"Christian \"ChrML\" Myhre Lundheim\n"
         L"Arushan \"aru\" Raj\n"
         L"Frank \"Aim\" Spijkerman\n"
-        L"Pascal \"sbx320\" Stücker\n"
+        L"Pascal \"sbx320\" Stücker\n"
         L"Kevin \"Kevuwk\" Whiteside\n"
         L"Richard \"Cazomino05\" Whitlock\n"
         L"Gamesnert\n"
@@ -130,7 +130,7 @@ CCredits::CCredits(void)
         "W\n"
         "Fedor Sinev\n"
         "zneext\n"
-        "ZRec\n"
+        "ZReC\n"
         "Pawelo / 4O4\n"
         "Sergeanur\n"
         "AleksCore\n"

Client/core/CDebugView.cpp

@@ -76,7 +76,7 @@ CDebugView::CDebugView(CGUI* pManager, const CVector2D& vecPosition) : CChat()
     UpdateGUI();
 }
 
-void CDebugView::Draw(bool bUseCacheTexture)
+void CDebugView::Draw(bool bUseCacheTexture, bool bAllowOutline)
 {
     // Are we visible?
     if (!m_bVisible)
@@ -91,9 +91,11 @@ void CDebugView::Draw(bool bUseCacheTexture)
     CVector2D vecResolution = m_pManager->GetResolution();
     float     height = m_uiNumLines * GetFontHeight(1) * m_vecScale.fY;
     m_vecBackgroundPosition = vecPosition * vecResolution - CVector2D(0, height);
+    m_vecBackgroundPosition.fX = Round(m_vecBackgroundPosition.fX);
+    m_vecBackgroundPosition.fY = Round(m_vecBackgroundPosition.fY);
     m_pBackground->SetPosition(m_vecBackgroundPosition);
 
-    CChat::Draw(bUseCacheTexture);
+    CChat::Draw(bUseCacheTexture, bAllowOutline);
     g_pChat = pChat;
 }