Move to special world property

FileEX · FileEX · commit e2fafa048f2c · 2024-11-19T13:09:55.000+01:00
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,8 +135,6 @@ CClientGame::CClientGame(bool bLocalPlay) : m_ServerInfo(new CServerInfo())
     m_Glitches[GLITCH_BADDRIVEBYHITBOX] = false;
     m_Glitches[GLITCH_QUICKSTAND] = false;
     m_Glitches[GLITCH_KICKOUTOFVEHICLE_ONMODELREPLACE] = false;
-    m_Glitches[GLITCH_IGNOREFIRESTATE] = false;
-    g_pMultiplayer->SetIgnoreFireState(false);
 
     g_pMultiplayer->DisableBadDrivebyHitboxes(true);
 
@@ -5974,9 +5972,6 @@ bool CClientGame::SetGlitchEnabled(unsigned char ucGlitch, bool bEnabled)
             g_pMultiplayer->DisableQuickReload(!bEnabled);
         if (ucGlitch == GLITCH_CLOSEDAMAGE)
             g_pMultiplayer->DisableCloseRangeDamage(!bEnabled);
-        if (ucGlitch == GLITCH_IGNOREFIRESTATE)
-            g_pMultiplayer->SetIgnoreFireState(bEnabled);
-
         return true;
     }
     return false;
@@ -6031,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;
 }
@@ -6068,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;
 }
@@ -6481,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", "Kickout of vehicle on model replace", "Ignore fire state"};
+                                       "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/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -200,7 +200,6 @@ class CClientGame
         GLITCH_BADDRIVEBYHITBOX,
         GLITCH_QUICKSTAND,
         GLITCH_KICKOUTOFVEHICLE_ONMODELREPLACE,
-        GLITCH_IGNOREFIRESTATE,
         NUM_GLITCHES
     };
 
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -2372,7 +2372,6 @@ void CPacketHandler::Packet_MapInfo(NetBitStreamInterface& bitStream)
     g_pClientGame->SetGlitchEnabled(CClientGame::GLITCH_FASTSPRINT, funBugs.data3.bFastSprint);
     g_pClientGame->SetGlitchEnabled(CClientGame::GLITCH_BADDRIVEBYHITBOX, funBugs.data4.bBadDrivebyHitboxes);
     g_pClientGame->SetGlitchEnabled(CClientGame::GLITCH_QUICKSTAND, funBugs.data5.bQuickStand);
-    g_pClientGame->SetGlitchEnabled(CClientGame::GLITCH_IGNOREFIRESTATE, funBugs.data6.bIgnoreFireState);
 
     SWorldSpecialPropertiesStateSync wsProps;
     if (bitStream.Can(eBitStreamVersion::WorldSpecialProperties))
@@ -2394,6 +2393,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,30 +1862,6 @@ void CMultiplayerSA::DisableCloseRangeDamage(bool bDisabled)
     }
 }
 
-void CMultiplayerSA::SetIgnoreFireState(bool ignore)
-{
-    if (ignore)
-    {
-        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
-
-        // CTaskSimplePlayerOnFoot::ProcessPlayerWeapon
-        MemSet((void*)0x685A7F, 0x90, 14);
-    }
-    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);
-    }
-}
-
 bool CMultiplayerSA::GetInteriorSoundsEnabled()
 {
     return bInteriorSoundsEnabled;
diff --git a/Client/multiplayer_sa/CMultiplayerSA.h b/Client/multiplayer_sa/CMultiplayerSA.h
@@ -99,7 +99,6 @@ class CMultiplayerSA : public CMultiplayer
     void DisableQuickReload(bool bDisable);
     void DisableCloseRangeDamage(bool bDisable);
     void DisableBadDrivebyHitboxes(bool bDisable) { m_bBadDrivebyHitboxesDisabled = bDisable; }
-    void SetIgnoreFireState(bool ignore) override;
 
     bool GetExplosionsDisabled();
     void DisableExplosions(bool bDisabled);
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/Client/sdk/multiplayer/CMultiplayer.h b/Client/sdk/multiplayer/CMultiplayer.h
@@ -216,7 +216,6 @@ class CMultiplayer
     virtual void DisableQuickReload(bool bDisable) = 0;
     virtual void DisableCloseRangeDamage(bool bDisable) = 0;
     virtual void DisableBadDrivebyHitboxes(bool bDisable) = 0;
-    virtual void SetIgnoreFireState(bool ignore) = 0;
 
     virtual bool  GetExplosionsDisabled() = 0;
     virtual void  DisableExplosions(bool bDisabled) = 0;
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -238,7 +238,6 @@ CGame::CGame() : m_FloodProtect(4, 30000, 30000)            // Max of 4 connecti
     m_Glitches[GLITCH_BADDRIVEBYHITBOX] = false;
     m_Glitches[GLITCH_QUICKSTAND] = false;
     m_Glitches[GLITCH_KICKOUTOFVEHICLE_ONMODELREPLACE] = false;
-    m_Glitches[GLITCH_IGNOREFIRESTATE] = false;
     for (int i = 0; i < WEAPONTYPE_LAST_WEAPONTYPE; i++)
         m_JetpackWeapons[i] = false;
 
@@ -259,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;
@@ -274,7 +274,6 @@ CGame::CGame() : m_FloodProtect(4, 30000, 30000)            // Max of 4 connecti
     m_GlitchNames["baddrivebyhitbox"] = GLITCH_BADDRIVEBYHITBOX;
     m_GlitchNames["quickstand"] = GLITCH_QUICKSTAND;
     m_GlitchNames["kickoutofvehicle_onmodelreplace"] = GLITCH_KICKOUTOFVEHICLE_ONMODELREPLACE;
-    m_GlitchNames["ignorefirestate"] = GLITCH_IGNOREFIRESTATE;
 
     m_bCloudsEnabled = true;
 
diff --git a/Server/mods/deathmatch/logic/CGame.h b/Server/mods/deathmatch/logic/CGame.h
@@ -194,7 +194,6 @@ class CGame
         GLITCH_BADDRIVEBYHITBOX,
         GLITCH_QUICKSTAND,
         GLITCH_KICKOUTOFVEHICLE_ONMODELREPLACE,
-        GLITCH_IGNOREFIRESTATE,
         NUM_GLITCHES
     };
 
diff --git a/Server/mods/deathmatch/logic/packets/CMapInfoPacket.cpp b/Server/mods/deathmatch/logic/packets/CMapInfoPacket.cpp
@@ -170,7 +170,6 @@ bool CMapInfoPacket::Write(NetBitStreamInterface& BitStream) const
     funBugs.data3.bFastSprint = g_pGame->IsGlitchEnabled(CGame::GLITCH_FASTSPRINT);
     funBugs.data4.bBadDrivebyHitboxes = g_pGame->IsGlitchEnabled(CGame::GLITCH_BADDRIVEBYHITBOX);
     funBugs.data5.bQuickStand = g_pGame->IsGlitchEnabled(CGame::GLITCH_QUICKSTAND);
-    funBugs.data6.bIgnoreFireState = g_pGame->IsGlitchEnabled(CGame::GLITCH_IGNOREFIRESTATE);
     BitStream.Write(&funBugs);
 
     // Write world special properties states
@@ -193,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
@@ -1937,10 +1937,6 @@ struct SFunBugsStateSync : public ISyncStructure
     {
         BITCOUNT5 = 1
     };
-    enum
-    {
-        BITCOUNT6 = 1
-    };
 
     bool Read(NetBitStreamInterface& bitStream)
     {
@@ -1962,11 +1958,6 @@ struct SFunBugsStateSync : public ISyncStructure
         else
             data5.bQuickStand = 0;
 
-        if (bitStream.Can(eBitStreamVersion::Glitch_IgnoreFireState))
-            bOk &= bitStream.ReadBits(reinterpret_cast<char*>(&data6), BITCOUNT6);
-        else
-            data6.bIgnoreFireState = 0;
-
         //// Example for adding item:
         // if ( bitStream.Version() >= 0x999 )
         //     bOk &= bitStream.ReadBits ( reinterpret_cast < char* > ( &data9 ), BITCOUNT9 );
@@ -1986,8 +1977,6 @@ struct SFunBugsStateSync : public ISyncStructure
             bitStream.WriteBits(reinterpret_cast<const char*>(&data4), BITCOUNT4);
         if (bitStream.Can(eBitStreamVersion::QuickStandGlitch))
             bitStream.WriteBits(reinterpret_cast<const char*>(&data5), BITCOUNT5);
-        if (bitStream.Can(eBitStreamVersion::Glitch_IgnoreFireState))
-            bitStream.WriteBits(reinterpret_cast<const char*>(&data6), BITCOUNT6);
 
         //// Example for adding item:
         // if (bitStream.Can(eBitStreamVersion::YourGlitch))
@@ -2026,12 +2015,6 @@ struct SFunBugsStateSync : public ISyncStructure
     {
         bool bQuickStand : 1;
     } data5;
-
-    // Add new ones in separate structs
-    struct
-    {
-        bool bIgnoreFireState : 1;
-    } data6;
 };
 
 //////////////////////////////////////////
@@ -2061,6 +2044,10 @@ struct SWorldSpecialPropertiesStateSync : public ISyncStructure
     {
         BITCOUNT5 = 1
     };
+    enum
+    {
+        BITCOUNT6 = 1
+    };
 
     bool Read(NetBitStreamInterface& bitStream)
     {
@@ -2085,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);
@@ -2108,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);
@@ -2149,6 +2144,11 @@ struct SWorldSpecialPropertiesStateSync : public ISyncStructure
     {
         bool tunnelweatherblend : 1;
     } data5;
+
+    struct
+    {
+        bool ignoreFireState : 1;
+    } data6;
     
     SWorldSpecialPropertiesStateSync()
     {
@@ -2169,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
@@ -572,9 +572,9 @@ enum class eBitStreamVersion : unsigned short
     // 2024-09-04
     RespawnObject_Serverside,
 
-    // Add ignorefirestate glitch
+    // Add ignorefirestate special world property
     // 2024-11-07
-    Glitch_IgnoreFireState,
+    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.
