Add new special world property ignorefirestate (#3845)

FileEX · web-flow · commit 46f3580fbd8e · 2024-11-21T22:34:07.000Z
diff --git a/Client/game_sa/CGameSA.cpp b/Client/game_sa/CGameSA.cpp
@@ -848,6 +848,34 @@ void CGameSA::SetRoadSignsTextEnabled(bool isEnabled)
     m_isRoadSignsTextEnabled = isEnabled;
 }
 
+void CGameSA::SetIgnoreFireStateEnabled(bool isEnabled)
+{
+    if (isEnabled == m_isIgnoreFireStateEnabled)
+        return;
+
+    if (isEnabled)
+    {
+        MemSet((void*)0x6511B9, 0x90, 10);            // CCarEnterExit::IsVehicleStealable
+        MemSet((void*)0x643A95, 0x90, 14);            // CTaskComplexEnterCar::CreateFirstSubTask
+        MemSet((void*)0x6900B5, 0x90, 14);            // CTaskComplexCopInCar::ControlSubTask
+        MemSet((void*)0x64F3DB, 0x90, 14);            // CCarEnterExit::IsPlayerToQuitCarEnter
+
+        MemSet((void*)0x685A7F, 0x90, 14);            // CTaskSimplePlayerOnFoot::ProcessPlayerWeapon
+    }
+    else
+    {
+        // Restore original bytes
+        MemCpy((void*)0x6511B9, "\x88\x86\x90\x04\x00\x00\x85\xC0\x75\x3E", 10);
+        MemCpy((void*)0x643A95, "\x8B\x88\x90\x04\x00\x00\x85\xC9\x0F\x85\x99\x01\x00\x00", 14);
+        MemCpy((void*)0x6900B5, "\x8B\x81\x90\x04\x00\x00\x85\xC0\x0F\x85\x1A\x01\x00\x00", 14);
+        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);
+    }
+
+    m_isIgnoreFireStateEnabled = isEnabled;
+}
+
 bool CGameSA::PerformChecks()
 {
     std::map<std::string, SCheatSA*>::iterator it;
diff --git a/Client/game_sa/CGameSA.h b/Client/game_sa/CGameSA.h
@@ -249,6 +249,8 @@ class CGameSA : public CGame
     bool IsTunnelWeatherBlendEnabled() const noexcept override { return m_isTunnelWeatherBlendEnabled; }
     void SetTunnelWeatherBlendEnabled(bool isEnabled) override;
 
+    bool IsIgnoreFireStateEnabled() const noexcept override { return m_isIgnoreFireStateEnabled; }
+    void SetIgnoreFireStateEnabled(bool isEnabled) override;
 
     unsigned long GetMinuteDuration();
     void          SetMinuteDuration(unsigned long ulTime);
@@ -378,6 +380,7 @@ class CGameSA : public CGame
     bool         m_isRoadSignsTextEnabled{true};
     bool         m_isBuildingsRemoved{false};
     bool         m_isExtendedWaterCannonsEnabled{false};
+    bool         m_isIgnoreFireStateEnabled{false};
 
     static unsigned int&  ClumpOffset;
 
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -135,6 +135,7 @@ CClientGame::CClientGame(bool bLocalPlay) : m_ServerInfo(new CServerInfo())
     m_Glitches[GLITCH_BADDRIVEBYHITBOX] = false;
     m_Glitches[GLITCH_QUICKSTAND] = false;
     m_Glitches[GLITCH_KICKOUTOFVEHICLE_ONMODELREPLACE] = false;
+
     g_pMultiplayer->DisableBadDrivebyHitboxes(true);
 
     // Remove Night & Thermal vision view (if enabled).
@@ -6025,6 +6026,9 @@ bool CClientGame::SetWorldSpecialProperty(WorldSpecialProperty property, bool is
         case WorldSpecialProperty::TUNNELWEATHERBLEND:
             g_pGame->SetTunnelWeatherBlendEnabled(isEnabled);
             return true;
+        case WorldSpecialProperty::IGNOREFIRESTATE:
+            g_pGame->SetIgnoreFireStateEnabled(isEnabled);
+            return true;
     }
     return false;
 }
@@ -6062,6 +6066,8 @@ bool CClientGame::IsWorldSpecialProperty(WorldSpecialProperty property)
             return g_pGame->IsRoadSignsTextEnabled();
         case WorldSpecialProperty::TUNNELWEATHERBLEND:
             return g_pGame->IsTunnelWeatherBlendEnabled();
+        case WorldSpecialProperty::IGNOREFIRESTATE:
+            return g_pGame->IsIgnoreFireStateEnabled();
     }
     return false;
 }
@@ -6475,7 +6481,7 @@ void CClientGame::OutputServerInfo()
     {
         SString     strEnabledGlitches;
         const char* szGlitchNames[] = {"Quick reload",         "Fast fire",  "Fast move", "Crouch bug", "Close damage", "Hit anim", "Fast sprint",
-                                       "Bad driveby hitboxes", "Quick stand"};
+                                       "Bad driveby hitboxes", "Quick stand", "Kickout of vehicle on model replace"};
         for (uint i = 0; i < NUM_GLITCHES; i++)
         {
             if (IsGlitchEnabled(i))
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -2397,6 +2397,7 @@ void CPacketHandler::Packet_MapInfo(NetBitStreamInterface& bitStream)
     g_pClientGame->SetWorldSpecialProperty(WorldSpecialProperty::ROADSIGNSTEXT, wsProps.data3.roadsignstext);
     g_pClientGame->SetWorldSpecialProperty(WorldSpecialProperty::EXTENDEDWATERCANNONS, wsProps.data4.extendedwatercannons);
     g_pClientGame->SetWorldSpecialProperty(WorldSpecialProperty::TUNNELWEATHERBLEND, wsProps.data5.tunnelweatherblend);
+    g_pClientGame->SetWorldSpecialProperty(WorldSpecialProperty::IGNOREFIRESTATE, wsProps.data6.ignoreFireState);
 
     float fJetpackMaxHeight = 100;
     if (!bitStream.Read(fJetpackMaxHeight))
diff --git a/Client/multiplayer_sa/CMultiplayerSA.cpp b/Client/multiplayer_sa/CMultiplayerSA.cpp
@@ -1862,6 +1862,7 @@ void CMultiplayerSA::DisableCloseRangeDamage(bool bDisabled)
         MemPut<BYTE>(0x73BA00, 0x86);
     }
 }
+
 bool CMultiplayerSA::GetInteriorSoundsEnabled()
 {
     return bInteriorSoundsEnabled;
diff --git a/Client/sdk/game/CGame.h b/Client/sdk/game/CGame.h
@@ -230,6 +230,9 @@ class __declspec(novtable) CGame
     virtual bool IsTunnelWeatherBlendEnabled() const noexcept = 0;
     virtual void SetTunnelWeatherBlendEnabled(bool isEnabled) = 0;
 
+    virtual bool IsIgnoreFireStateEnabled() const noexcept = 0;
+    virtual void SetIgnoreFireStateEnabled(bool isEnabled) = 0;
+
     virtual CWeapon*     CreateWeapon() = 0;
     virtual CWeaponStat* CreateWeaponStat(eWeaponType weaponType, eWeaponSkill weaponSkill) = 0;
 
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -258,6 +258,7 @@ CGame::CGame() : m_FloodProtect(4, 30000, 30000)            // Max of 4 connecti
     m_WorldSpecialProps[WorldSpecialProperty::EXTENDEDWATERCANNONS] = true;
     m_WorldSpecialProps[WorldSpecialProperty::ROADSIGNSTEXT] = true;
     m_WorldSpecialProps[WorldSpecialProperty::TUNNELWEATHERBLEND] = true;
+    m_WorldSpecialProps[WorldSpecialProperty::IGNOREFIRESTATE] = false;
 
     m_JetpackWeapons[WEAPONTYPE_MICRO_UZI] = true;
     m_JetpackWeapons[WEAPONTYPE_TEC9] = true;
diff --git a/Server/mods/deathmatch/logic/packets/CMapInfoPacket.cpp b/Server/mods/deathmatch/logic/packets/CMapInfoPacket.cpp
@@ -192,6 +192,7 @@ bool CMapInfoPacket::Write(NetBitStreamInterface& BitStream) const
         wsProps.data3.roadsignstext = g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::ROADSIGNSTEXT);
         wsProps.data4.extendedwatercannons = g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::EXTENDEDWATERCANNONS);
         wsProps.data5.tunnelweatherblend = g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::TUNNELWEATHERBLEND);
+        wsProps.data6.ignoreFireState = g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::IGNOREFIRESTATE);
         BitStream.Write(&wsProps);
     }
 
diff --git a/Shared/mods/deathmatch/logic/Enums.cpp b/Shared/mods/deathmatch/logic/Enums.cpp
@@ -101,6 +101,7 @@ ADD_ENUM(WorldSpecialProperty::FIREBALLDESTRUCT, "fireballdestruct")
 ADD_ENUM(WorldSpecialProperty::EXTENDEDWATERCANNONS, "extendedwatercannons")
 ADD_ENUM(WorldSpecialProperty::ROADSIGNSTEXT, "roadsignstext")
 ADD_ENUM(WorldSpecialProperty::TUNNELWEATHERBLEND, "tunnelweatherblend")
+ADD_ENUM(WorldSpecialProperty::IGNOREFIRESTATE, "ignorefirestate")
 IMPLEMENT_ENUM_CLASS_END("world-special-property")
 
 IMPLEMENT_ENUM_BEGIN(ePacketID)
diff --git a/Shared/mods/deathmatch/logic/Enums.h b/Shared/mods/deathmatch/logic/Enums.h
@@ -91,6 +91,7 @@ enum class WorldSpecialProperty
     ROADSIGNSTEXT,
     EXTENDEDWATERCANNONS,
     TUNNELWEATHERBLEND,
+    IGNOREFIRESTATE,
 };
 DECLARE_ENUM_CLASS(WorldSpecialProperty);
 
diff --git a/Shared/sdk/net/SyncStructures.h b/Shared/sdk/net/SyncStructures.h
@@ -2044,6 +2044,10 @@ struct SWorldSpecialPropertiesStateSync : public ISyncStructure
     {
         BITCOUNT5 = 1
     };
+    enum
+    {
+        BITCOUNT6 = 1
+    };
 
     bool Read(NetBitStreamInterface& bitStream)
     {
@@ -2068,6 +2072,11 @@ struct SWorldSpecialPropertiesStateSync : public ISyncStructure
         else
             data5.tunnelweatherblend = true;
 
+        if (bitStream.Can(eBitStreamVersion::WorldSpecialProperty_IgnoreFireState))
+            isOK &= bitStream.ReadBits(reinterpret_cast<char*>(&data6), BITCOUNT6);
+        else
+            data6.ignoreFireState = false;
+
         //// Example for adding item:
         // if (bitStream.Can(eBitStreamVersion::YourProperty))
         //     isOK &= bitStream.ReadBits(reinterpret_cast<char*>(&data9), BITCOUNT9);
@@ -2091,6 +2100,9 @@ struct SWorldSpecialPropertiesStateSync : public ISyncStructure
         if (bitStream.Can(eBitStreamVersion::WorldSpecialProperty_TunnelWeatherBlend))
             bitStream.WriteBits(reinterpret_cast<const char*>(&data5), BITCOUNT5);
 
+        if (bitStream.Can(eBitStreamVersion::WorldSpecialProperty_IgnoreFireState))
+            bitStream.WriteBits(reinterpret_cast<const char*>(&data6), BITCOUNT6);
+
         //// Example for adding item:
         // if (bitStream.Can(eBitStreamVersion::YourProperty))
         //     bitStream.WriteBits(reinterpret_cast<const char*>(&data9), BITCOUNT9);
@@ -2132,6 +2144,11 @@ struct SWorldSpecialPropertiesStateSync : public ISyncStructure
     {
         bool tunnelweatherblend : 1;
     } data5;
+
+    struct
+    {
+        bool ignoreFireState : 1;
+    } data6;
     
     SWorldSpecialPropertiesStateSync()
     {
@@ -2152,6 +2169,7 @@ struct SWorldSpecialPropertiesStateSync : public ISyncStructure
         data3.roadsignstext = true;
         data4.extendedwatercannons = true;
         data5.tunnelweatherblend = true;
+        data6.ignoreFireState = false;
     }
 };
 
diff --git a/Shared/sdk/net/bitstream.h b/Shared/sdk/net/bitstream.h
@@ -576,6 +576,10 @@ enum class eBitStreamVersion : unsigned short
     // 2024-09-04
     CheckDuplicateSerials,
 
+    // Add ignorefirestate special world property
+    // 2024-11-07
+    WorldSpecialProperty_IgnoreFireState,
+
     // This allows us to automatically increment the BitStreamVersion when things are added to this enum.
     // Make sure you only add things above this comment.
     Next,

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ CClientGame::CClientGame(bool bLocalPlay) : m_ServerInfo(new CServerInfo())`
`135`	`135`	`m_Glitches[GLITCH_BADDRIVEBYHITBOX] = false;`
`136`	`136`	`m_Glitches[GLITCH_QUICKSTAND] = false;`
`137`	`137`	`m_Glitches[GLITCH_KICKOUTOFVEHICLE_ONMODELREPLACE] = false;`
	`138`	`+`
`138`	`139`	`g_pMultiplayer->DisableBadDrivebyHitboxes(true);`
`139`	`140`
`140`	`141`	`// Remove Night & Thermal vision view (if enabled).`
`@@ -6025,6 +6026,9 @@ bool CClientGame::SetWorldSpecialProperty(WorldSpecialProperty property, bool is`
`6025`	`6026`	`case WorldSpecialProperty::TUNNELWEATHERBLEND:`
`6026`	`6027`	`g_pGame->SetTunnelWeatherBlendEnabled(isEnabled);`
`6027`	`6028`	`return true;`
	`6029`	`+ case WorldSpecialProperty::IGNOREFIRESTATE:`
	`6030`	`+ g_pGame->SetIgnoreFireStateEnabled(isEnabled);`
	`6031`	`+ return true;`
`6028`	`6032`	`}`
`6029`	`6033`	`return false;`
`6030`	`6034`	`}`
`@@ -6062,6 +6066,8 @@ bool CClientGame::IsWorldSpecialProperty(WorldSpecialProperty property)`
`6062`	`6066`	`return g_pGame->IsRoadSignsTextEnabled();`
`6063`	`6067`	`case WorldSpecialProperty::TUNNELWEATHERBLEND:`
`6064`	`6068`	`return g_pGame->IsTunnelWeatherBlendEnabled();`
	`6069`	`+ case WorldSpecialProperty::IGNOREFIRESTATE:`
	`6070`	`+ return g_pGame->IsIgnoreFireStateEnabled();`
`6065`	`6071`	`}`
`6066`	`6072`	`return false;`
`6067`	`6073`	`}`
`@@ -6475,7 +6481,7 @@ void CClientGame::OutputServerInfo()`
`6475`	`6481`	`{`
`6476`	`6482`	`SString strEnabledGlitches;`
`6477`	`6483`	`const char* szGlitchNames[] = {"Quick reload", "Fast fire", "Fast move", "Crouch bug", "Close damage", "Hit anim", "Fast sprint",`
`6478`		`- "Bad driveby hitboxes", "Quick stand"};`
	`6484`	`+ "Bad driveby hitboxes", "Quick stand", "Kickout of vehicle on model replace"};`
`6479`	`6485`	`for (uint i = 0; i < NUM_GLITCHES; i++)`
`6480`	`6486`	`{`
`6481`	`6487`	`if (IsGlitchEnabled(i))`
Original file line number	Diff line number	Diff line change
`@@ -1862,6 +1862,7 @@ void CMultiplayerSA::DisableCloseRangeDamage(bool bDisabled)`
`1862`	`1862`	`MemPut<BYTE>(0x73BA00, 0x86);`
`1863`	`1863`	`}`
`1864`	`1864`	`}`
	`1865`	`+`
`1865`	`1866`	`bool CMultiplayerSA::GetInteriorSoundsEnabled()`
`1866`	`1867`	`{`
`1867`	`1868`	`return bInteriorSoundsEnabled;`
Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,7 @@ bool CMapInfoPacket::Write(NetBitStreamInterface& BitStream) const`
`192`	`192`	`wsProps.data3.roadsignstext = g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::ROADSIGNSTEXT);`
`193`	`193`	`wsProps.data4.extendedwatercannons = g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::EXTENDEDWATERCANNONS);`
`194`	`194`	`wsProps.data5.tunnelweatherblend = g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::TUNNELWEATHERBLEND);`
	`195`	`+ wsProps.data6.ignoreFireState = g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::IGNOREFIRESTATE);`
`195`	`196`	`BitStream.Write(&wsProps);`
`196`	`197`	`}`
`197`	`198`