Merge branch 'master' into issue-9608

Author: patrikjuvonen

.github/ISSUE_TEMPLATE/security-report.md

@@ -4,6 +4,8 @@ about: Submit cheat or security vulnerability
 
 ---
 
+STOP RIGHT THERE!
+
 Please submit your cheats or security vulnerabilities to @ccw on forum.mtasa.com. Please do not submit them here.
 
 @ccw can be found here: https://forum.mtasa.com/profile/7264-ccw/

.gitignore

@@ -410,9 +410,9 @@ __pycache__/
 Bin/
 Build/
 InstallFiles/
-utils/vswhere.exe
 utils/DXFiles.zip
 utils/DXFiles/
 !*.so
 !*.dll
 !*.exe
+utils/vswhere.exe

.travis.yml

@@ -2,6 +2,9 @@ language: cpp
 sudo: false
 dist: trusty
 
+git:
+  depth: 1
+
 matrix:
   include:
     - compiler: gcc

Client/cefweb/CWebView.cpp

@@ -752,7 +752,7 @@ void CWebView::OnLoadError(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> fr
 // //
 //                                                                //
 ////////////////////////////////////////////////////////////////////
-bool CWebView::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool isRedirect)
+bool CWebView::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool userGesture, bool isRedirect)
 {
     /*
         From documentation:

Client/cefweb/CWebView.h

@@ -129,7 +129,7 @@ class CWebView : public CWebViewInterface,
                              const CefString& failedURL) override;
 
     // CefRequestHandler methods
-    virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool isRedirect) override;
+    virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool userGesture, bool isRedirect) override;
     virtual CefRequestHandler::ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
                                                                 CefRefPtr<CefRequestCallback> callback) override;
 

Client/core/CCommandFuncs.cpp

@@ -234,62 +234,63 @@ void CCommandFuncs::Unload(const char* szParameters)
 
 void CCommandFuncs::Connect(const char* szParameters)
 {
-    CModManager::GetSingleton().Unload();
+    // Parse the arguments (host port nick pass)
+    char szBuffer[256] = "";
+    if (szParameters)
+        STRNCPY(szBuffer, szParameters, NUMELMS(szBuffer));
 
-    // Any mod loaded?
-    if (!CModManager::GetSingleton().GetCurrentMod())
+    if (!strncmp(szBuffer, "mtasa://", 8))
     {
-        // Parse the arguments (host port nick pass)
-        char szBuffer[256] = "";
-        if (szParameters)
-            STRNCPY(szBuffer, szParameters, NUMELMS(szBuffer));
+        // Using a mtasa:// URI to connect
+        SString strArguments = g_pCore->GetConnectCommandFromURI(szBuffer);
 
-        if (!strncmp(szBuffer, "mtasa://", 8))
+        if (strArguments.length() > 0 && g_pCore->GetCommands()->Execute(strArguments))
         {
-            // Using a mtasa:// URI to connect
-            SString strArguments = g_pCore->GetConnectCommandFromURI(szBuffer);
-
-            if (strArguments.length() > 0 && g_pCore->GetCommands()->Execute(strArguments))
-            {
-                return;
-            }
+            return;
         }
+    }
 
-        char* szHost = strtok(szBuffer, " ");
-        char* szPort = strtok(NULL, " ");
-        char* szNick = strtok(NULL, " ");
-        char* szPass = strtok(NULL, " ");
+    char* szHost = strtok(szBuffer, " ");
+    char* szPort = strtok(NULL, " ");
+    char* szNick = strtok(NULL, " ");
+    char* szPass = strtok(NULL, " ");
 
-        std::string strNick;
-        if (!szNick)
-            CVARS_GET("nick", strNick);
-        else
-            strNick = szNick;
+    std::string strNick;
+    if (!szNick)
+        CVARS_GET("nick", strNick);
+    else
+        strNick = szNick;
 
-        // Got all required arguments?
-        if (!szHost || !szPort || strNick.empty())
-        {
-            CCore::GetSingleton().GetConsole()->Print(_("connect: Syntax is 'connect <host> <port> [<nick> <pass>]'"));
-            return;
-        }
+    // Got all required arguments?
+    if (!szHost || strNick.empty())
+    {
+        CCore::GetSingleton().GetConsole()->Print(_("connect: Syntax is 'connect <host> [<port> <nick> <pass>]'"));
+        return;
+    }
 
-        // Verify and convert the port number
-        int iPort = atoi(szPort);
-        if (iPort <= 0 || iPort > 0xFFFF)
-        {
-            CCore::GetSingleton().GetConsole()->Print(_("connect: Bad port number"));
-            return;
-        }
+    // Verify and convert the port number
+    int iPort = szPort ? atoi(szPort) : 22003;
+    if (iPort <= 0 || iPort > 0xFFFF)
+    {
+        CCore::GetSingleton().GetConsole()->Print(_("connect: Bad port number"));
+        return;
+    }
 
-        unsigned short usPort = static_cast<unsigned short>(iPort);
+    unsigned short usPort = static_cast<unsigned short>(iPort);
 
-        // Got a password?
-        char emptyPass = 0;
-        if (!szPass)
-        {
-            szPass = &emptyPass;
-        }
+    // Got a password?
+    char emptyPass = 0;
+    if (!szPass)
+    {
+        szPass = &emptyPass;
+    }
 
+    // Unload any mod before connecting to a server
+    CModManager::GetSingleton().Unload();
+
+    // Only connect if there is no mod loaded
+    if (!CModManager::GetSingleton().GetCurrentMod())
+    {
         // Start the connect
         if (CCore::GetSingleton().GetConnectManager()->Connect(szHost, usPort, strNick.c_str(), szPass))
         {

Client/core/CCredits.cpp

@@ -45,14 +45,14 @@ CCredits::CCredits(void)
         L"Raphael \"Mr.Hankey\" Leiteritz\n"
         L"Ed \"eAi\" Lyons\n"
         L"Christian \"ChrML\" Myhre Lundheim\n"
+        L"Qais \"qaisjp\" Patankar\n"
         L"Arushan \"aru\" Raj\n"
         L"Frank \"Aim\" Spijkerman\n"
         L"Pascal \"sbx320\" Stücker\n"
         L"Kevin \"Kevuwk\" Whiteside\n"
         L"Richard \"Cazomino05\" Whitlock\n"
         L"Gamesnert\n"
         L"Jusonex\n"
-        L"Qais \"qaisjp\" Patankar\n"
         L"\n"
         L"\n");
 
@@ -61,14 +61,15 @@ CCredits::CCredits(void)
         "\n\n"
 
         "Arran\n"
-        "Remp\n"
-        "MX_Master\n"
+        "Dutchman101\n"
         "Iztas\n"
         "impulze\n"
         "JoeBullet\n"
         "lopezloo\n"
+        "MX_Master\n"
         "Marek \"Necktrox\" Kulik\n"
-        "Dutchman101\n"
+        "Remp\n"
+        "Danish \"Saml1er\" Khan\n"
         "\n";
 
     m_strCredits += _("Game Design / Scripting");
@@ -94,10 +95,12 @@ CCredits::CCredits(void)
 
         "Lukasz \"W\" Biegaj\n"
         "Florian \"Flobu\" Busse\n"
+        "Callum \"Callum\" Dawson\n"
         "Philip \"Fenix\" Farquharson\n"
         "Robin \"robhol\" Holm\n"
+        "Patrik \"myonlake\" Juvonen\n"
+        "Gabrielius \"Dezash\" Laurinavicius\n"
         "Adam \"50p\" Telega\n"
-        "Callum \"Callum\" Dawson\n"
         "Ilya \"Kenix\" Volkov\n"
         "Gothem\n"
         "rafalh\n"
@@ -142,6 +145,9 @@ CCredits::CCredits(void)
         "JR10\n"
         "PhrozenByte\n"
         "AboShanab\n"
+        "GTX / Timic3\n"
+        "FileEX\n"
+        "Pirulax\n"
         "\n";
     "\n";
 
@@ -162,6 +168,7 @@ CCredits::CCredits(void)
         "Oliver \"Oli\" Brown\n"
         "Wojciech \"Wojjie\" Hlibowicki\n"
         "Chris \"Cray\" McArthur\n"
+        "Rob 'Sugar Daddy' Pooley\n"
         "Hans \"Blokker\" Roes\n"
         "Kent \"Kent747\" Simon\n"
         "Matthew \"Towncivilian\" Wolfe\n"
@@ -172,7 +179,6 @@ CCredits::CCredits(void)
         "Phatlooser\n"
         "Dwayne 'The 'Woovie' Rock' Johnson\n"
         "max 'Hobo Pie' Power\n"
-        "Rob 'Sugar Daddy' Pooley\n"
         "diegofkda\n"
         "Ren712\n"
         "\n"

Client/core/CGUI.cpp

@@ -11,6 +11,7 @@
 
 #include "StdInc.h"
 #include <game/CGame.h>
+#include <windowsx.h>
 
 using std::string;
 
@@ -541,7 +542,7 @@ bool CLocalGUI::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
                 return true;
 
             case WM_MOUSEMOVE:
-                pGUI->ProcessMouseInput(CGUI_MI_MOUSEPOS, LOWORD(lParam), HIWORD(lParam));
+                pGUI->ProcessMouseInput(CGUI_MI_MOUSEPOS, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
                 return true;
 
             case WM_LBUTTONDOWN:

Client/core/CMouseControl.cpp

@@ -11,6 +11,7 @@
 
 #include "StdInc.h"
 #include "CMouseControl.h"
+#include <windowsx.h>
 #include <game/CGame.h>
 
 #define MOUSE_CONTROL_MULTIPLIER    35
@@ -78,7 +79,7 @@ bool CMouseControl::ProcessMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam)
 
     // Let's calculate our mouse movement directions
     CVector2D resolution = g_pCore->GetGUI()->GetResolution();
-    int       iX = LOWORD(lParam), iY = HIWORD(lParam);
+    int       iX = GET_X_LPARAM(lParam), iY = GET_Y_LPARAM(lParam);
     float     fX = (iX - resolution.fX * 0.5f) / resolution.fX;
 
     fX *= MOUSE_CONTROL_MULTIPLIER;
@@ -137,4 +138,4 @@ void CMouseControl::ApplyAxes(CControllerState& cs)
 
     cs.LeftStickX = m_usLeftStickX;
     cs.LeftStickY = m_usLeftStickY;
-}
+}

Client/core/Graphics/CGraphics.cpp

@@ -807,6 +807,94 @@ void CGraphics::DrawRectQueued(float fX, float fY, float fWidth, float fHeight,
     AddQueueItem(Item, bPostGUI);
 }
 
+void CGraphics::DrawCircleQueued(float fX, float fY, float fRadius, float fStartAngle, float fStopAngle, unsigned long ulColor, unsigned long ulColorCenter, ushort fSegments, float fRatio, bool bPostGUI)
+{
+    if (g_pCore->IsWindowMinimized())
+        return;
+
+    BeginDrawBatch();
+    CheckModes(EDrawMode::DX_SPRITE, m_ActiveBlendMode);
+
+    // Set up a queue item
+    sDrawQueueItem Item;
+    Item.eType = QUEUE_CIRCLE;
+    Item.blendMode = m_ActiveBlendMode;
+    Item.Circle.fX = fX;
+    Item.Circle.fY = fY;
+    Item.Circle.fRadius = fRadius;
+    Item.Circle.fStartAngle = fStartAngle;
+    Item.Circle.fStopAngle = fStopAngle;
+    Item.Circle.bPostGUI = bPostGUI;
+    Item.Circle.fSegments = fSegments;
+    Item.Circle.fRatio = fRatio;
+    Item.Circle.ulColor = ulColor;
+    Item.Circle.ulColorCenter = ulColorCenter;
+    // Add it to the queue
+    AddQueueItem(Item, bPostGUI);
+
+    DrawCircleInternal(fX, fY, fRadius, fStartAngle, fStopAngle, ulColor, ulColorCenter, fSegments, fRatio, bPostGUI);
+
+    EndDrawBatch();
+}
+
+struct stVertex
+{
+    float x, y, z;
+    D3DCOLOR color;
+};
+
+void CGraphics::DrawCircleInternal(float fX, float fY, float fRadius, float fStartAngle, float fStopAngle, unsigned long ulColor, unsigned long ulColorCenter, ushort fSegments, float fRatio, bool bPostGUI)
+{
+    fStartAngle = D3DXToRadian(fStartAngle);
+    fStopAngle = D3DXToRadian(fStopAngle);
+
+    std::vector<stVertex> vecPoints;
+
+    // center
+    stVertex vertCenter;
+    vertCenter.x = fX;
+    vertCenter.y = fY;
+    vertCenter.z = 0;
+    vertCenter.color = ulColorCenter;
+    vecPoints.push_back(vertCenter);
+    
+    // first
+    stVertex vertFirst;
+    vertFirst.x = fX + fRadius * cos(fStartAngle) * fRatio;
+    vertFirst.y = fY + fRadius * sin(fStartAngle) / fRatio;
+    vertFirst.z = 0;
+    vertFirst.color = ulColor;
+    vecPoints.push_back(vertFirst);
+
+    float fSegments2 = (float)fSegments + 1;
+    float segmentAngle = ((fStopAngle - fStartAngle) / fSegments2);
+
+    for (float fAngle = fStartAngle; fAngle <= fStopAngle;)
+    {
+        stVertex vertex;
+        vertex.x = fX + fRadius * cos(fAngle) * fRatio;
+        vertex.y = fY + fRadius * sin(fAngle) / fRatio;
+        vertex.z = 0;
+        vertex.color = ulColor;
+        vecPoints.push_back(vertex);
+        fAngle = fAngle + segmentAngle;
+    }
+
+    // last
+    stVertex vertLast;
+    vertLast.x = fX + fRadius * cos(fStopAngle) * fRatio;
+    vertLast.y = fY + fRadius * sin(fStopAngle) / fRatio;
+    vertLast.z = 0;
+    vertLast.color = ulColor;
+    vecPoints.push_back(vertLast);
+
+    if (vecPoints.size() >= 3)
+    {
+        m_pDevice->SetTexture(0, 0);
+        m_pDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, vecPoints.size() - 2, &vecPoints[0], sizeof(stVertex));
+    }
+}
+
 void CGraphics::DrawTextureQueued(float fX, float fY, float fWidth, float fHeight, float fU, float fV, float fSizeU, float fSizeV, bool bRelativeUV,
                                   CMaterialItem* pMaterial, float fRotation, float fRotCenOffX, float fRotCenOffY, unsigned long ulColor, bool bPostGUI)
 {
@@ -1445,6 +1533,13 @@ void CGraphics::DrawQueueItem(const sDrawQueueItem& Item)
             DrawRectangleInternal(Item.Rect.fX, Item.Rect.fY, Item.Rect.fWidth, Item.Rect.fHeight, Item.Rect.ulColor, Item.Rect.bSubPixelPositioning);
             break;
         }
+        case QUEUE_CIRCLE:
+        {
+            CheckModes(EDrawMode::DX_SPRITE, Item.blendMode);
+            DrawCircleInternal(Item.Circle.fX, Item.Circle.fY, Item.Circle.fRadius, Item.Circle.fStartAngle, Item.Circle.fStopAngle, Item.Circle.ulColor, Item.Circle.ulColorCenter, Item.Circle.fSegments, Item.Circle.fRatio, Item.Circle.bPostGUI);
+            break;
+        }
+
         case QUEUE_TEXT:
         {
             RECT rect;