Merge branch 'master' into bugfix/fire_task

Author: tederis

Client/core/CClientVariables.cpp

@@ -358,6 +358,7 @@ void CClientVariables::LoadDefaults()
     DEFAULT("discord_rpc_share_data_firsttime", false);                               // Display the user data sharing consent dialog box - for the first time
     DEFAULT("browser_enable_gpu", true);                                              // Enable GPU in CEF? (allows stuff like WebGL to function)
     DEFAULT("process_cpu_affinity", true);                                            // Set CPU 0 affinity to improve game performance and fix the known issue in single-threaded games
+    DEFAULT("ask_before_disconnect", true);                                           // Ask before disconnecting from a server
 
     if (!Exists("locale"))
     {

Client/mods/deathmatch/logic/CClientStreamElement.cpp

@@ -61,7 +61,7 @@ void CClientStreamElement::InternalStreamIn(bool bInstantly)
     }
 }
 
-void CClientStreamElement::InternalStreamOut(bool ignoreSendingEvent)
+void CClientStreamElement::InternalStreamOut()
 {
     if (m_bStreamedIn)
     {
@@ -83,24 +83,13 @@ void CClientStreamElement::InternalStreamOut(bool ignoreSendingEvent)
             }
         }
 
-        if (!ignoreSendingEvent)
-        {
-            CLuaArguments Arguments;
-            CallEvent("onClientElementStreamOut", Arguments, true);
-        }
+        CLuaArguments Arguments;
+        CallEvent("onClientElementStreamOut", Arguments, true);
     }
 }
 
 void CClientStreamElement::NotifyCreate()
 {
-    // If the dimensions are different, stream out and do not continue
-    if (GetDimension() != m_pStreamer->m_usDimension)
-    {
-        m_bStreamedIn = true; // InternalStreamOut need it
-        InternalStreamOut(true);
-        return;
-    }
-
     // Update common atrributes
     if (!m_bDoubleSidedInit)
         m_bDoubleSided = IsDoubleSided();

Client/mods/deathmatch/logic/CClientStreamElement.h

@@ -30,7 +30,7 @@ class CClientStreamElement : public CClientEntity
     CClientStreamSector*    GetStreamSector() { return m_pStreamSector; }
     bool                    IsStreamedIn() { return m_bStreamedIn; }
     void                    InternalStreamIn(bool bInstantly);
-    void                    InternalStreamOut(bool ignoreSendingEvent = false);
+    void                    InternalStreamOut();
     virtual void            StreamIn(bool bInstantly) = 0;
     virtual void            StreamOut() = 0;
     virtual void            NotifyCreate();