Merge branch 'master' into bugfix/fire_task

Author: Dutchman101

.github/workflows/dockerimage.yaml

@@ -1,6 +1,7 @@
 name: Docker Image
 
 on: 
+  workflow_dispatch:
   push:
     branches:
     - master

Client/core/CMainMenu.cpp

@@ -842,6 +842,14 @@ bool CMainMenu::OnMenuClick(CGUIMouseEventArgs Args)
             case MENU_ITEM_MAP_EDITOR:
                 AskUserIfHeWantsToDisconnect(m_pHoveredItem->menuType);
                 return true;
+            case MENU_ITEM_DISCONNECT:
+                if (g_pCore->GetCVars()->GetValue("ask_before_disconnect", true))
+                {
+                    AskUserIfHeWantsToDisconnect(m_pHoveredItem->menuType);
+                    return true;
+                }
+     
+                break;
             default:
                 break;
         }
@@ -863,7 +871,7 @@ bool CMainMenu::OnMenuClick(CGUIMouseEventArgs Args)
     switch (m_pHoveredItem->menuType)
     {
         case MENU_ITEM_DISCONNECT:
-            OnDisconnectButtonClick(pElement);
+            OnDisconnectButtonClick();
             break;
         case MENU_ITEM_QUICK_CONNECT:
             OnQuickConnectButtonClick(pElement, Args.button == LeftButton);
@@ -948,7 +956,7 @@ void CMainMenu::HideServerInfo()
     m_ServerInfo.Hide();
 }
 
-bool CMainMenu::OnDisconnectButtonClick(CGUIElement* pElement)
+bool CMainMenu::OnDisconnectButtonClick()
 {
     // Return if we haven't faded in yet
     if (m_ucFade != FADE_VISIBLE)
@@ -1251,6 +1259,9 @@ void CMainMenu::WantsToDisconnectCallBack(void* pData, uint uiButton)
             case MENU_ITEM_MAP_EDITOR:
                 OnEditorButtonClick();
                 break;
+            case MENU_ITEM_DISCONNECT:
+                OnDisconnectButtonClick();
+                break;
             default:
                 break;
         }

Client/core/CMainMenu.h

@@ -89,7 +89,7 @@ class CMainMenu
     bool OnResumeButtonClick(CGUIElement* pElement);
     bool OnBrowseServersButtonClick(CGUIElement* pElement);
     bool OnHostGameButtonClick();
-    bool OnDisconnectButtonClick(CGUIElement* pElement);
+    bool OnDisconnectButtonClick();
     bool OnEditorButtonClick();
     bool OnSettingsButtonClick(CGUIElement* pElement);
     bool OnAboutButtonClick(CGUIElement* pElement);

Client/core/CSettings.cpp

@@ -411,6 +411,11 @@ void CSettings::CreateGUI()
     m_pPhotoSavingCheckbox->GetPosition(vecTemp, false);
     m_pPhotoSavingCheckbox->AutoSize(NULL, 20.0f);
 
+    m_pCheckBoxAskBeforeDisconnect = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabMultiplayer, _("Ask before disconnecting from server using main menu"), true));
+    m_pCheckBoxAskBeforeDisconnect->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 20.0f));
+    m_pCheckBoxAskBeforeDisconnect->GetPosition(vecTemp, false);
+    m_pCheckBoxAskBeforeDisconnect->AutoSize(NULL, 20.0f);
+
     m_pCheckBoxCustomizedSAFiles = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabMultiplayer, _("Use customized GTA:SA files"), true));
     m_pCheckBoxCustomizedSAFiles->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 20.0f));
     m_pCheckBoxCustomizedSAFiles->GetPosition(vecTemp, false);
@@ -3080,6 +3085,10 @@ void CSettings::LoadData()
     CVARS_GET("allow_discord_rpc", bAllowDiscordRPC);
     m_pCheckBoxAllowDiscordRPC->SetSelected(bAllowDiscordRPC);
 
+    bool bAskBeforeDisconnect;
+    CVARS_GET("ask_before_disconnect", bAskBeforeDisconnect);
+    m_pCheckBoxAskBeforeDisconnect->SetSelected(bAskBeforeDisconnect);
+
     // Customized sa files
     m_pCheckBoxCustomizedSAFiles->SetSelected(GetApplicationSettingInt("customized-sa-files-request") != 0);
     m_pCheckBoxCustomizedSAFiles->SetVisible(GetApplicationSettingInt("customized-sa-files-show") != 0);
@@ -3557,6 +3566,9 @@ void CSettings::SaveData()
         }
     }
 
+    bool bAskBeforeDisconnect = m_pCheckBoxAskBeforeDisconnect->GetSelected();
+    CVARS_SET("ask_before_disconnect", bAskBeforeDisconnect);
+
     // Grass
     bool bGrassEnabled = m_pCheckBoxGrass->GetSelected();
     CVARS_SET("grass", bGrassEnabled);

Client/core/CSettings.h

@@ -216,6 +216,7 @@ class CSettings
     CGUICheckBox*  m_pWin8ColorCheckBox;
     CGUICheckBox*  m_pWin8MouseCheckBox;
     CGUICheckBox*  m_pPhotoSavingCheckbox;
+    CGUICheckBox*  m_pCheckBoxAskBeforeDisconnect;
     CGUICheckBox*  m_pProcessAffinityCheckbox;
     CGUILabel*     m_pUpdateBuildTypeLabel;
     CGUIComboBox*  m_pUpdateBuildTypeCombo;

Client/game_sa/CGameSA.cpp

@@ -890,6 +890,9 @@ void CGameSA::SetIgnoreFireStateEnabled(bool isEnabled)
         MemSet((void*)0x64F3DB, 0x90, 14);            // CCarEnterExit::IsPlayerToQuitCarEnter
 
         MemSet((void*)0x685A7F, 0x90, 14);            // CTaskSimplePlayerOnFoot::ProcessPlayerWeapon
+
+        MemSet((void*)0x53A899, 0x90, 5);             // CFire::ProcessFire
+        MemSet((void*)0x53A990, 0x90, 5);             // CFire::ProcessFire
     }
     else
     {
@@ -900,6 +903,9 @@ void CGameSA::SetIgnoreFireStateEnabled(bool isEnabled)
         MemCpy((void*)0x64F3DB, "\x8B\x85\x90\x04\x00\x00\x85\xC0\x0F\x85\x1B\x01\x00\x00", 14);
 
         MemCpy((void*)0x685A7F, "\x8B\x86\x30\x07\x00\x00\x85\xC0\x0F\x85\x1D\x01\x00\x00", 14);
+
+        MemCpy((void*)0x53A899, "\xE8\x82\xF7\x0C\x00", 5);
+        MemCpy((void*)0x53A990, "\xE8\x8B\xF6\x0C\x00", 5);
     }
 
     m_isIgnoreFireStateEnabled = isEnabled;

Client/mods/deathmatch/StdInc.h

@@ -154,6 +154,7 @@
 #include "CLatentTransferManager.h"
 #include "CDebugHookManager.h"
 #include "lua/CLuaShared.h"
+#include "CStringName.h"
 
 // Deathmatch includes
 #include "ClientCommands.h"

Client/mods/deathmatch/logic/CClientStreamElement.cpp

@@ -61,7 +61,7 @@ void CClientStreamElement::InternalStreamIn(bool bInstantly)
     }
 }
 
-void CClientStreamElement::InternalStreamOut()
+void CClientStreamElement::InternalStreamOut(bool ignoreSendingEvent)
 {
     if (m_bStreamedIn)
     {
@@ -83,13 +83,24 @@ void CClientStreamElement::InternalStreamOut()
             }
         }
 
-        CLuaArguments Arguments;
-        CallEvent("onClientElementStreamOut", Arguments, true);
+        if (!ignoreSendingEvent)
+        {
+            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();
+    void                    InternalStreamOut(bool ignoreSendingEvent = false);
     virtual void            StreamIn(bool bInstantly) = 0;
     virtual void            StreamOut() = 0;
     virtual void            NotifyCreate();

Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp

@@ -1767,13 +1767,13 @@ int CLuaElementDefs::SetElementData(lua_State* luaVM)
 {
     //  bool setElementData ( element theElement, string key, var value, [bool synchronize = true] )
     CClientEntity* pEntity;
-    SString        strKey;
+    CStringName    key;
     CLuaArgument   value;
     bool           bSynchronize;
 
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pEntity);
-    argStream.ReadString(strKey);
+    argStream.ReadStringName(key);
     argStream.ReadLuaArgument(value);
     argStream.ReadBool(bSynchronize, true);
 
@@ -1782,15 +1782,16 @@ int CLuaElementDefs::SetElementData(lua_State* luaVM)
         CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
         if (pLuaMain)
         {
-            if (strKey.length() > MAX_CUSTOMDATA_NAME_LENGTH)
+            if (key->length() > MAX_CUSTOMDATA_NAME_LENGTH)
             {
                 // Warn and truncate if key is too long
                 m_pScriptDebugging->LogCustom(luaVM, SString("Truncated argument @ '%s' [%s]", lua_tostring(luaVM, lua_upvalueindex(1)),
                                                              *SString("string length reduced to %d characters at argument 2", MAX_CUSTOMDATA_NAME_LENGTH)));
-                strKey = strKey.Left(MAX_CUSTOMDATA_NAME_LENGTH);
+
+                key = key->substr(0, MAX_CUSTOMDATA_NAME_LENGTH);
             }
 
-            if (CStaticFunctionDefinitions::SetElementData(*pEntity, strKey, value, bSynchronize))
+            if (CStaticFunctionDefinitions::SetElementData(*pEntity, key.ToCString(), value, bSynchronize))
             {
                 lua_pushboolean(luaVM, true);
                 return 1;
@@ -1809,26 +1810,27 @@ int CLuaElementDefs::RemoveElementData(lua_State* luaVM)
 {
     //  bool removeElementData ( element theElement, string key )
     CClientEntity* pEntity;
-    SString        strKey;
+    CStringName    key;
 
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pEntity);
-    argStream.ReadString(strKey);
+    argStream.ReadStringName(key);
 
     if (!argStream.HasErrors())
     {
         CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
         if (pLuaMain)
         {
-            if (strKey.length() > MAX_CUSTOMDATA_NAME_LENGTH)
+            if (key->length() > MAX_CUSTOMDATA_NAME_LENGTH)
             {
                 // Warn and truncate if key is too long
                 m_pScriptDebugging->LogCustom(luaVM, SString("Truncated argument @ '%s' [%s]", lua_tostring(luaVM, lua_upvalueindex(1)),
                                                              *SString("string length reduced to %d characters at argument 2", MAX_CUSTOMDATA_NAME_LENGTH)));
-                strKey = strKey.Left(MAX_CUSTOMDATA_NAME_LENGTH);
+
+                key = key->substr(0, MAX_CUSTOMDATA_NAME_LENGTH);
             }
 
-            if (CStaticFunctionDefinitions::RemoveElementData(*pEntity, strKey))
+            if (CStaticFunctionDefinitions::RemoveElementData(*pEntity, key.ToCString()))
             {
                 lua_pushboolean(luaVM, true);
                 return 1;