Merge branch 'master' into colshape-type

Author: CrosRoad95

.clang-format

@@ -0,0 +1,111 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlines: DontAlign
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     160
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+# IncludeBlocks:   Preserve
+IncludeCategories: 
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 12
+SpacesInAngles:  false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Auto
+TabWidth:        4
+UseTab:          Never
+...
+

Client/ceflauncher/Main.cpp

@@ -1,12 +1,12 @@
 /*****************************************************************************
-*
-*  PROJECT:     Multi Theft Auto v1.0
-*               (Shared logic for modifications)
-*  LICENSE:     See LICENSE in the top level directory
-*  FILE:        ceflauncher/Main.cpp
-*  PURPOSE:     CEF launcher entry point
-*
-*****************************************************************************/
+ *
+ *  PROJECT:     Multi Theft Auto v1.0
+ *               (Shared logic for modifications)
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        ceflauncher/Main.cpp
+ *  PURPOSE:     CEF launcher entry point
+ *
+ *****************************************************************************/
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <string>
@@ -22,9 +22,9 @@
     (set flag.new_cef_exe on the build server to generate new exe)
 */
 
-int _declspec(dllimport) InitCEF ();
+int _declspec(dllimport) InitCEF();
 
-int WINAPI WinMain ( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdShow, int nCmdShow )
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdShow, int nCmdShow)
 {
     return InitCEF();
 }

Client/ceflauncher_DLL/CCefApp.h

@@ -1,12 +1,12 @@
 /*****************************************************************************
-*
-*  PROJECT:     Multi Theft Auto v1.0
-*               (Shared logic for modifications)
-*  LICENSE:     See LICENSE in the top level directory
-*  FILE:        ceflauncher/CCefApp.h
-*  PURPOSE:     CefApp implementation
-*
-*****************************************************************************/
+ *
+ *  PROJECT:     Multi Theft Auto v1.0
+ *               (Shared logic for modifications)
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        ceflauncher/CCefApp.h
+ *  PURPOSE:     CefApp implementation
+ *
+ *****************************************************************************/
 #include <cef3/include/cef_app.h>
 #include <string>
 #include <sstream>
@@ -17,73 +17,73 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
 {
 public:
     CCefApp() {}
-    virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler () override { return this; };
+    virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override { return this; };
 
     // http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnFocusedNodeChanged(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefDOMNode%3E)
-    virtual void OnFocusedNodeChanged ( CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node ) override
+    virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) override
     {
-        if ( m_bHasInputFocus )
+        if (m_bHasInputFocus)
         {
-            if ( node )
+            if (node)
                 return;
 
             // Tell MTA that we lost input focus
-            auto message = CefProcessMessage::Create ( "InputFocus" );
-            message->GetArgumentList ()->SetBool ( 0, false );
-            browser->SendProcessMessage ( PID_BROWSER, message );
+            auto message = CefProcessMessage::Create("InputFocus");
+            message->GetArgumentList()->SetBool(0, false);
+            browser->SendProcessMessage(PID_BROWSER, message);
 
             // Set variable to ensure that the event does not trigger twice
             m_bHasInputFocus = false;
             return;
         }
         else
         {
-            if ( !node )
+            if (!node)
                 return;
 
-            if ( node->GetType () == CefDOMNode::Type::DOM_NODE_TYPE_ELEMENT && !node->GetFormControlElementType ().empty () )
+            if (node->GetType() == CefDOMNode::Type::DOM_NODE_TYPE_ELEMENT && !node->GetFormControlElementType().empty())
             {
-                auto message = CefProcessMessage::Create ( "InputFocus" );
-                message->GetArgumentList ()->SetBool ( 0, true );
-                browser->SendProcessMessage ( PID_BROWSER, message );
+                auto message = CefProcessMessage::Create("InputFocus");
+                message->GetArgumentList()->SetBool(0, true);
+                browser->SendProcessMessage(PID_BROWSER, message);
 
                 // Set variable to ensure that the event does not trigger twice
                 m_bHasInputFocus = true;
             }
         }
     }
 
-    virtual void OnRegisterCustomSchemes ( CefRawPtr < CefSchemeRegistrar > registrar ) override
+    virtual void OnRegisterCustomSchemes(CefRawPtr<CefSchemeRegistrar> registrar) override
     {
         // Register custom MTA scheme (has to be called in all proceseses)
-        registrar->AddCustomScheme ( "mtalocal", false, false, false, false, false, true );
+        registrar->AddCustomScheme("mtalocal", false, false, false, false, false, true);
     }
 
-
-    // http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E) //
-    virtual void OnContextCreated ( CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context ) override
+    // http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E)
+    // //
+    virtual void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override
     {
         // Get global object and create a v8 handler instance
-        CefRefPtr<CefV8Value> globalObject = context->GetGlobal ();
-        CefRefPtr<CV8Handler> handler = new CV8Handler ( frame );
+        CefRefPtr<CefV8Value> globalObject = context->GetGlobal();
+        CefRefPtr<CV8Handler> handler = new CV8Handler(frame);
 
         // Create MTA object
-        CefRefPtr<CefV8Value> mtaObject = CefV8Value::CreateObject ( nullptr, nullptr );
+        CefRefPtr<CefV8Value> mtaObject = CefV8Value::CreateObject(nullptr, nullptr);
 
         // Bind V8 --> C++ functions
-        V8Helpers::BindV8Function ( handler, mtaObject, "triggerEvent", Javascript_triggerEvent );
+        V8Helpers::BindV8Function(handler, mtaObject, "triggerEvent", Javascript_triggerEvent);
 
         // Assign mtaObject to global object
-        globalObject->SetValue ( "mta", mtaObject, V8_PROPERTY_ATTRIBUTE_NONE );
+        globalObject->SetValue("mta", mtaObject, V8_PROPERTY_ATTRIBUTE_NONE);
     }
 
-    static void Javascript_triggerEvent ( CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments )
+    static void Javascript_triggerEvent(CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments)
     {
-        if ( arguments.size () == 0 )
+        if (arguments.size() == 0)
             return;
 
-        CefRefPtr<CefProcessMessage> message = V8Helpers::SerialiseV8Arguments ( "TriggerLuaEvent", arguments );
-        frame->GetBrowser ()->SendProcessMessage ( PID_BROWSER, message );
+        CefRefPtr<CefProcessMessage> message = V8Helpers::SerialiseV8Arguments("TriggerLuaEvent", arguments);
+        frame->GetBrowser()->SendProcessMessage(PID_BROWSER, message);
     }
 
 public:

Client/ceflauncher_DLL/Main.cpp

@@ -1,12 +1,12 @@
 /*****************************************************************************
-*
-*  PROJECT:     Multi Theft Auto v1.0
-*               (Shared logic for modifications)
-*  LICENSE:     See LICENSE in the top level directory
-*  FILE:        ceflauncher/Main.cpp
-*  PURPOSE:     CEF launcher entry point
-*
-*****************************************************************************/
+ *
+ *  PROJECT:     Multi Theft Auto v1.0
+ *               (Shared logic for modifications)
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        ceflauncher/Main.cpp
+ *  PURPOSE:     CEF launcher entry point
+ *
+ *****************************************************************************/
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include "CCefApp.h"
@@ -18,27 +18,27 @@
     #pragma comment(lib, "cef_sandbox.lib")
 #endif
 
-int _declspec(dllexport) InitCEF ()
+int _declspec(dllexport) InitCEF()
 {
     // Get absolute CEFLauncher.exe path
     TCHAR buffer[MAX_PATH];
-    GetModuleFileName ( NULL, buffer, MAX_PATH );
-    std::wstring currentFileName ( buffer );
+    GetModuleFileName(NULL, buffer, MAX_PATH);
+    std::wstring currentFileName(buffer);
 
     // Extract MTA path and set DLL directory (absolute path is required here)
-    size_t pos = currentFileName.find_last_of ( L'\\' );
-    std::wstring mtaPath = currentFileName.substr ( 0, pos - 3 ); // Strip "CEF"
-    SetDllDirectory ( mtaPath.c_str () );
+    size_t       pos = currentFileName.find_last_of(L'\\');
+    std::wstring mtaPath = currentFileName.substr(0, pos - 3);            // Strip "CEF"
+    SetDllDirectory(mtaPath.c_str());
 
     // Load CEF
-    CefMainArgs mainArgs ( GetModuleHandle(NULL) );
-    CefRefPtr<CCefApp> app { new CCefApp };
+    CefMainArgs        mainArgs(GetModuleHandle(NULL));
+    CefRefPtr<CCefApp> app{new CCefApp};
 
     void* sandboxInfo = nullptr;
 #ifdef CEF_ENABLE_SANDBOX
     CefScopedSandboxInfo scopedSandbox;
     sandboxInfo = scopedSandbox.sandbox_info();
 #endif
 
-    return CefExecuteProcess ( mainArgs, app, sandboxInfo);
+    return CefExecuteProcess(mainArgs, app, sandboxInfo);
 }