Merge branch 'master' into feature/chatbox-position

Author: Marek Kulik

.editorconfig

@@ -2,9 +2,12 @@
 root = true
 
 [*]
-end_of_line = crlf
 insert_final_newline = true
+end_of_line = crlf
 
 [*.{h,hpp,c,cpp,cc}]
 indent_style = space
 indent_size = 4
+
+[*.sh]
+end_of_line = lf

.gitignore

@@ -307,3 +307,6 @@ _Pvt_Extensions
 Bin/
 Build/
 InstallFiles/
+utils/vswhere.exe
+utils/DXFiles.zip
+utils/DXFiles/

.travis.yml

@@ -29,7 +29,7 @@ matrix:
         NIGHTLY_UPLOAD=0
 
 before_script:
-  - wget https://github.com/sbx320/premake5-travis/blob/master/premake5?raw=true -O ./premake5 &&
+  - wget https://mirror.mtasa.com/bdata/premake5-travis -O ./premake5 &&
     chmod +x ./premake5 &&
     ./premake5 gmake && 
     cd Build

Client/ceflauncher/premake5.lua

@@ -7,7 +7,7 @@ project "CEFLauncher"
 	includedirs { "../sdk" }
 
 	links { "CEFLauncher DLL"}
-	flags { "WinMain" }
+	entrypoint "WinMainCRTStartup"
 
 	vpaths { 
 		["Headers/*"] = "**.h",

Client/cefweb/CWebView.cpp

@@ -65,8 +65,12 @@ void CWebView::Initialise ()
         browserSettings.javascript = bEnabledJavascript ? cef_state_t::STATE_ENABLED : cef_state_t::STATE_DISABLED;
     }
 
+    // Set background color to opaque white if transparency is disabled
+    if (!m_bIsTransparent)
+        browserSettings.background_color = 0xffffffff;
+
     CefWindowInfo windowInfo;
-    windowInfo.SetAsWindowless ( g_pCore->GetHookedWindow (), m_bIsTransparent );
+    windowInfo.SetAsWindowless ( g_pCore->GetHookedWindow () );
 
     CefBrowserHost::CreateBrowser ( windowInfo, this, "", browserSettings, nullptr );
 }

Client/core/CChat.cpp

@@ -124,6 +124,7 @@ void CChat::LoadCVars ( void )
     CVARS_GET ( "chat_text_color",              m_TextColor );
     CVARS_GET ( "chat_scale",                   m_vecScale );
     CVARS_GET ( "chat_width",                   fWidth );               if( m_bCanChangeWidth ) m_fNativeWidth = fWidth * CHAT_WIDTH;
+    CVARS_GET ( "chat_text_outline",            m_bTextBlackOutline );
     CVARS_GET ( "chat_css_style_text",          m_bCssStyleText );
     CVARS_GET ( "chat_css_style_background",    m_bCssStyleBackground );
     CVARS_GET ( "chat_line_life",               (unsigned int &)m_ulChatLineLife );
@@ -135,50 +136,6 @@ void CChat::LoadCVars ( void )
     CVARS_GET ( "chat_position_horizontal",     (unsigned int &)m_ePositionHorizontal );
     CVARS_GET ( "chat_position_vertical",       (unsigned int &)m_ePositionVertical );
     CVARS_GET ( "chat_text_alignment",          (unsigned int &)m_eTextAlign );
-
-    // Modify default chat box to be like 'Transparent' preset
-    SString strFlags;
-    CVARS_GET ( "fixup_flags", strFlags );
-    if ( strFlags.find ( "-cb" ) == std::string::npos )
-    {
-        CVARS_SET ( "fixup_flags", strFlags + "-cb" );
-
-        if ( Font                       == 0                            // chat_font
-             && m_uiNumLines            == 7                            // chat_lines
-             && m_Color                 == CColor (0,0,128,100)         // chat_color
-             && m_InputColor            == CColor (0,0,191,110)         // chat_input_color
-             && m_InputTextColor        == CColor (172,213,254,255)     // chat_input_text_color
-             && m_vecScale              == CVector2D ( 1.0f, 1.0f )     // chat_scale
-             && fWidth                  == 1.0f                         // chat_width
-             && m_bCssStyleText         == false                        // chat_css_style_text
-             && m_bCssStyleBackground   == false                        // chat_css_style_background
-             && m_ulChatLineLife        == 12000                        // chat_line_life
-             && m_ulChatLineFadeOut     == 3000                         // chat_line_fade_out
-            )
-        {
-            CVARS_SET ( "chat_font",                    (unsigned int)2 );
-            CVARS_SET ( "chat_color",                   CColor (0,0,0,0) );
-            CVARS_SET ( "chat_input_color",             CColor (0,0,0,0) );
-            CVARS_SET ( "chat_lines",                   10 );
-            CVARS_SET ( "chat_width",                   1.5f );
-            LoadCVars ();
-        }
-    }
-
-    // Fix mapalpha being set incorrectly in 1.0.4-9.1752.1
-    CVARS_GET ( "fixup_flags", strFlags );
-    if ( strFlags.find ( "-ma" ) == std::string::npos )
-    {
-        CVARS_SET ( "fixup_flags", strFlags + "-ma" );
-
-        int iVar = -1;
-        CVARS_GET ( "mapalpha", iVar );
-        if ( iVar < 3 )
-        {
-            iVar = 155;
-            CVARS_SET ( "mapalpha", iVar );
-        }
-    }
 }
 
 
@@ -303,7 +260,7 @@ void CChat::DrawDrawList ( const SDrawList& drawList, const CVector2D& topLeftOf
 
     for ( const auto & item : drawList.lineItemList )
     {
-        m_Lines [ item.uiLine ].Draw ( item.vecPosition - chatTopLeft + topLeftOffset, item.ucAlpha, drawList.bShadow, chatBounds );
+        m_Lines [ item.uiLine ].Draw ( item.vecPosition - chatTopLeft + topLeftOffset, item.ucAlpha, drawList.bShadow, drawList.bOutline, chatBounds );
     }
 
     CGraphics::GetSingleton ().EndDrawBatch ();
@@ -321,8 +278,8 @@ void CChat::GetDrawList ( SDrawList& outDrawList )
     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 );
-    bool bInputShadow = ( m_InputColor.A * m_fInputBackgroundAlpha == 0.f );
+    bool bShadow = ( m_Color.A * m_fBackgroundAlpha == 0.f ) && !m_bTextBlackOutline;
+    bool bInputShadow = ( m_InputColor.A * m_fInputBackgroundAlpha == 0.f ) && !m_bTextBlackOutline;
 
     if ( m_Color.A * m_fBackgroundAlpha > 0.f )
     {
@@ -347,6 +304,7 @@ void CChat::GetDrawList ( SDrawList& outDrawList )
 
     outDrawList.renderBounds = RenderBounds;
     outDrawList.bShadow = bShadow;
+    outDrawList.bOutline = m_bTextBlackOutline;
 
     // Smooth scroll
     int iLineScroll;
@@ -409,7 +367,7 @@ void CChat::GetDrawList ( SDrawList& outDrawList )
     if ( m_bInputVisible )
     {
         CVector2D vecPosition ( m_vecInputPosition.fX + ( 5.0f * m_vecScale.fX ), m_vecInputPosition.fY + ( fLineDifference * 0.125f ) );
-        m_InputLine.Draw ( vecPosition, 255, bInputShadow );
+        m_InputLine.Draw ( vecPosition, 255, bInputShadow, m_bTextBlackOutline );
     }
 }
 
@@ -1028,7 +986,7 @@ float CChat::GetTextExtent ( const char * szText, float fScale )
 }
 
 
-void CChat::DrawTextString ( const char * szText, CRect2D DrawArea, float fZ, CRect2D ClipRect, unsigned long ulFormat, unsigned long ulColor, float fScaleX, float fScaleY, const CRect2D& RenderBounds )
+void CChat::DrawTextString ( const char * szText, CRect2D DrawArea, float fZ, CRect2D ClipRect, unsigned long ulFormat, unsigned long ulColor, float fScaleX, float fScaleY, bool bOutline, const CRect2D& RenderBounds )
 {
     if ( !g_pChat )
         return;
@@ -1047,18 +1005,18 @@ void CChat::DrawTextString ( const char * szText, CRect2D DrawArea, float fZ, CR
         {
             // Clip text at the top
             if ( DrawArea.fY1 + fLineHeight - RenderBounds.fY1 > 1 )
-               g_pCore->GetGraphics ()->DrawText ( ( int ) DrawArea.fX1, ( int ) RenderBounds.fY1, ( int ) DrawArea.fX2, ( int ) DrawArea.fY1 + fLineHeight, ulColor, szText, fScaleX, fScaleY, DT_LEFT | DT_BOTTOM | DT_SINGLELINE , g_pChat->m_pDXFont );
+               g_pCore->GetGraphics ()->DrawString ( ( int ) DrawArea.fX1, ( int ) RenderBounds.fY1, ( int ) DrawArea.fX2, ( int ) DrawArea.fY1 + fLineHeight, ulColor, szText, fScaleX, fScaleY, DT_LEFT | DT_BOTTOM | DT_SINGLELINE , g_pChat->m_pDXFont, bOutline );
         }
         else if ( DrawArea.fY1 + fLineHeight > RenderBounds.fY2 )
         {
             // Clip text at the bottom
             if ( RenderBounds.fY2 - DrawArea.fY1 > 1 )
-                g_pCore->GetGraphics ()->DrawText ( ( int ) DrawArea.fX1, ( int ) DrawArea.fY1, ( int ) DrawArea.fX2, ( int ) RenderBounds.fY2, ulColor, szText, fScaleX, fScaleY, DT_LEFT | DT_TOP | DT_SINGLELINE , g_pChat->m_pDXFont );
+                g_pCore->GetGraphics ()->DrawString ( ( int ) DrawArea.fX1, ( int ) DrawArea.fY1, ( int ) DrawArea.fX2, ( int ) RenderBounds.fY2, ulColor, szText, fScaleX, fScaleY, DT_LEFT | DT_TOP | DT_SINGLELINE , g_pChat->m_pDXFont, bOutline );
         }
         else
         {
             // Text not clipped
-            g_pCore->GetGraphics ()->DrawText ( ( int ) DrawArea.fX1, ( int ) DrawArea.fY1, ( int ) DrawArea.fX1, ( int ) DrawArea.fY1, ulColor, szText, fScaleX, fScaleY, DT_LEFT | DT_TOP | DT_NOCLIP, g_pChat->m_pDXFont );
+            g_pCore->GetGraphics ()->DrawString ( ( int ) DrawArea.fX1, ( int ) DrawArea.fY1, ( int ) DrawArea.fX1, ( int ) DrawArea.fY1, ulColor, szText, fScaleX, fScaleY, DT_LEFT | DT_TOP | DT_NOCLIP, g_pChat->m_pDXFont, bOutline );
         }
     }
 }
@@ -1180,13 +1138,13 @@ const char* CChatLine::Format ( const char* szStringAnsi, float fWidth, CColor&
 }
 
 
-void CChatLine::Draw ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, const CRect2D& RenderBounds )
+void CChatLine::Draw ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline, const CRect2D& RenderBounds )
 {
     float fCurrentX = vecPosition.fX;
     std::vector < CChatLineSection >::iterator iter = m_Sections.begin ();
     for ( ; iter != m_Sections.end () ; iter++ )
     {
-        (*iter).Draw ( CVector2D ( fCurrentX, vecPosition.fY ), ucAlpha, bShadow, RenderBounds );
+        (*iter).Draw ( CVector2D ( fCurrentX, vecPosition.fY ), ucAlpha, bShadow, bOutline, RenderBounds );
         fCurrentX += (*iter).GetWidth ();
     }
 }
@@ -1204,27 +1162,27 @@ float CChatLine::GetWidth ()
 }
 
 
-void CChatInputLine::Draw ( CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow )
+void CChatInputLine::Draw ( CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline )
 {
     CRect2D RenderBounds ( 0, 0, 9999, 9999 );
 
     CColor colPrefix;
     m_Prefix.GetColor ( colPrefix );
     if ( colPrefix.A > 0 )
-        m_Prefix.Draw ( vecPosition, colPrefix.A, bShadow, RenderBounds );
-
+        m_Prefix.Draw ( vecPosition, colPrefix.A, bShadow, bOutline, RenderBounds );
+    
     if ( g_pChat->m_InputTextColor.A > 0 && m_Sections.size () > 0 )
     {
         m_Sections [ 0 ].Draw ( CVector2D ( vecPosition.fX + m_Prefix.GetWidth (), vecPosition.fY ),
-            g_pChat->m_InputTextColor.A, bShadow, RenderBounds );
+            g_pChat->m_InputTextColor.A, bShadow, bOutline, RenderBounds );
 
         float fLineDifference = CChat::GetFontHeight ( g_pChat->m_vecScale.fY );
 
         vector < CChatLine >::iterator iter = m_ExtraLines.begin ();
         for ( ; iter != m_ExtraLines.end () ; iter++ )
         {
             vecPosition.fY += fLineDifference;
-            (*iter).Draw ( vecPosition, g_pChat->m_InputTextColor.A, bShadow, RenderBounds );
+            (*iter).Draw ( vecPosition, g_pChat->m_InputTextColor.A, bShadow, bOutline, RenderBounds );
         }
     }
 }
@@ -1256,17 +1214,17 @@ CChatLineSection& CChatLineSection::operator = ( const CChatLineSection& other )
     return *this;
 }
 
-void CChatLineSection::Draw ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, const CRect2D& RenderBounds )
+void CChatLineSection::Draw ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline, const CRect2D& RenderBounds )
 {
     if ( !m_strText.empty () && ucAlpha > 0 )
     {
         if ( bShadow )
         {
             CRect2D drawShadowAt ( vecPosition.fX + 1.0f, vecPosition.fY + 1.0f, vecPosition.fX + 1000.0f, vecPosition.fY + 1000.0f );
-            CChat::DrawTextString ( m_strText.c_str (), drawShadowAt, 0.0f, drawShadowAt, 0, COLOR_ARGB ( ucAlpha, 0, 0, 0 ), g_pChat->m_vecScale.fX, g_pChat->m_vecScale.fY, RenderBounds );
+            CChat::DrawTextString ( m_strText.c_str (), drawShadowAt, 0.0f, drawShadowAt, 0, COLOR_ARGB ( ucAlpha, 0, 0, 0 ), g_pChat->m_vecScale.fX, g_pChat->m_vecScale.fY, bOutline, RenderBounds );                
         }
         CRect2D drawAt ( vecPosition.fX, vecPosition.fY, vecPosition.fX + 1000.0f, vecPosition.fY + 1000.0f );
-        CChat::DrawTextString ( m_strText.c_str (), drawAt, 0.0f, drawAt, 0, COLOR_ARGB ( ucAlpha, m_Color.R, m_Color.G, m_Color.B ), g_pChat->m_vecScale.fX, g_pChat->m_vecScale.fY, RenderBounds );
+        CChat::DrawTextString ( m_strText.c_str (), drawAt, 0.0f, drawAt, 0, COLOR_ARGB ( ucAlpha, m_Color.R, m_Color.G, m_Color.B ), g_pChat->m_vecScale.fX, g_pChat->m_vecScale.fY, bOutline, RenderBounds );
     }
 }
 

Client/core/CChat.h

@@ -81,7 +81,7 @@ class CChatLineSection
 
     CChatLineSection&           operator =              ( const CChatLineSection& other );
 
-    void                        Draw                    ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, const CRect2D& RenderBounds );
+    void                        Draw                    ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline, const CRect2D& RenderBounds );
     float                       GetWidth                ( void );
     inline const char*          GetText                 ( void )            { return m_strText.c_str (); }
     void                        SetText                 ( const char* szText )  { m_strText = szText; }
@@ -101,7 +101,7 @@ class CChatLine
                                 CChatLine               ( void );
 
     virtual const char*         Format                  ( const char* szText, float fWidth, CColor& color, bool bColorCoded );
-    virtual void                Draw                    ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, const CRect2D& RenderBounds );    
+    virtual void                Draw                    ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline, const CRect2D& RenderBounds );    
     virtual float               GetWidth                ( void );
     bool                        IsActive                ( void )    { return m_bActive; }
     void                        SetActive               ( bool bActive )    { m_bActive = bActive; }
@@ -119,7 +119,7 @@ class CChatLine
 class CChatInputLine : public CChatLine
 {
 public:
-    void                        Draw                    ( CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow );
+    void                        Draw                    ( CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline );
     void                        Clear                   ( void );
 
     CChatLineSection            m_Prefix;
@@ -156,6 +156,7 @@ struct SDrawList
 {
     CRect2D                             renderBounds;
     bool                                bShadow;
+    bool                                bOutline;
     std::vector < SDrawListLineItem >   lineItemList;
 
     bool operator!= ( const SDrawList& other ) const
@@ -166,6 +167,7 @@ struct SDrawList
     {
         if ( lineItemList.size () != other.lineItemList.size ()
           || bShadow != other.bShadow
+          || bOutline != other.bOutline
           || renderBounds != other.renderBounds )
             return false;
 
@@ -212,7 +214,7 @@ class CChat
 
     static float                GetFontHeight           ( float fScale = 1.0f );
     static float                GetTextExtent           ( const char * szText, float fScale = 1.0f );
-    static void                 DrawTextString          ( const char * szText, CRect2D DrawArea, float fZ, CRect2D ClipRect, unsigned long ulFormat, unsigned long ulColor, float fScaleX, float fScaleY, const CRect2D& RenderBounds );
+    static void                 DrawTextString          ( const char * szText, CRect2D DrawArea, float fZ, CRect2D ClipRect, unsigned long ulFormat, unsigned long ulColor, float fScaleX, float fScaleY, bool bOutline, const CRect2D& RenderBounds );
 
     void                        SetColor                ( const CColor& Color );
     void                        SetInputColor           ( const CColor& Color );
@@ -286,6 +288,7 @@ class CChat
     CColor                      m_InputTextColor;
     bool                        m_bCssStyleText;
     bool                        m_bCssStyleBackground;
+    bool                        m_bTextBlackOutline;
     unsigned long               m_ulChatLineLife;
     unsigned long               m_ulChatLineFadeOut;
     bool                        m_bUseCEGUI;

Client/core/CClientVariables.cpp

@@ -289,15 +289,17 @@ void CClientVariables::LoadDefaults ( void )
     DEFAULT ( "console_size",               CVector2D ( 200, 200 ) );       // console size
     DEFAULT ( "serverbrowser_size",         CVector2D ( 720.0f, 495.0f ) ); // serverbrowser size
     DEFAULT ( "fps_limit",                  100 );                          // frame limiter
-    DEFAULT ( "chat_font",                  0 );                            // chatbox font type
-    DEFAULT ( "chat_lines",                 7 );                            // chatbox lines
-    DEFAULT ( "chat_color",                 CColor (0,0,128,100) );         // chatbox color
+    DEFAULT ( "chat_font",                  2 );                            // chatbox font type
+    DEFAULT ( "chat_lines",                 10 );                           // chatbox lines
+    DEFAULT ( "chat_color",                 CColor (0,0,0,0) );             // chatbox background color
     DEFAULT ( "chat_text_color",            CColor (172,213,254,255) );     // chatbox text color
-    DEFAULT ( "chat_input_color",           CColor (0,0,191,110) );         // chatbox input color
-    DEFAULT ( "chat_input_prefix_color",    CColor (172,213,254,255) );     // chatbox prefix input color
-    DEFAULT ( "chat_input_text_color",      CColor (172,213,254,255) );     // chatbox text input color
+    DEFAULT ( "chat_text_outline",          false );
+    DEFAULT ( "chat_input_color",           CColor (0,0,0,0) );             // chatbox input background color
+    DEFAULT ( "chat_input_prefix_color",    CColor (172,213,254,255) );     // chatbox input prefix color
+    DEFAULT ( "chat_input_text_color",      CColor (172,213,254,255) );     // chatbox input text color
     DEFAULT ( "chat_scale",                 CVector2D ( 1.0f, 1.0f ) );     // chatbox scale
-    DEFAULT ( "chat_width",                 1.0f );                         // chatbox width
+    DEFAULT ( "chat_width",                 1.5f );                         // chatbox width
+
     DEFAULT ( "chat_css_style_text",        false );                        // chatbox css/hl style text
     DEFAULT ( "chat_css_style_background",  false );                        // chatbox css/hl style background
     DEFAULT ( "chat_line_life",             12000 );                        // chatbox line life time

Client/core/CClientVariables.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
-*  PROJECT:     Multi Theft Auto v1.0
+*  PROJECT:     Multi Theft Auto
 *  LICENSE:     See LICENSE in the top level directory
 *  FILE:        core/CClientVariables.h
 *  PURPOSE:     Header file for client variable class
@@ -11,8 +11,7 @@
 *
 *****************************************************************************/
 
-#ifndef __CCLIENTVARIABLES_H
-#define __CCLIENTVARIABLES_H
+#pragma once
 
 #include <string>
 #include "CSingleton.h"
@@ -78,5 +77,3 @@ class CClientVariables : public CCVarsInterface, public CSingleton < CClientVari
     CXMLNode        *m_pStorage;
     int             m_iRevision;
 };
-
-#endif