New setting

Author: FileEX

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -4444,7 +4444,7 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
             pDamagedPed->GetGamePlayer()->SetHealth(fPreviousHealth);
             pDamagedPed->GetGamePlayer()->SetArmor(fPreviousArmor);
 
-            if (GetTickCount64_() - pDamagedPed->m_lastEventDamageCancelledTime >= g_TickRateSettings.cancelledDamageInterval)
+            if (m_triggerEventDamageCancelledForPeds && GetTickCount64_() - pDamagedPed->m_lastEventDamageCancelledTime >= g_TickRateSettings.cancelledDamageInterval)
             {
                 bool sendPacket = true;
 

Client/mods/deathmatch/logic/CClientGame.h

@@ -710,9 +710,10 @@ class CClientGame
     void PedStepHandler(CPedSAInterface* pPed, bool bFoot);
     void VehicleWeaponHitHandler(SVehicleWeaponHitEvent& event);
 
-    void SetEventDamageCancelledSettings(bool calledForVehicles, bool calledForDmgEveryFrame) noexcept
+    void SetEventDamageCancelledSettings(bool calledForVehicles, bool calledForPeds, bool calledForDmgEveryFrame) noexcept
     {
         m_triggerEventDamageCancelledForVehicles = calledForVehicles;
+        m_triggerEventDamageCancelledForPeds = calledForPeds;
         m_triggerEventDamageCancelledForDamageEveryFrame = calledForDmgEveryFrame;
     }
 
@@ -930,8 +931,9 @@ class CClientGame
 
     long long m_timeLastDiscordStateUpdate;
 
-    bool m_triggerEventDamageCancelledForVehicles;
-    bool m_triggerEventDamageCancelledForDamageEveryFrame;
+    bool m_triggerEventDamageCancelledForVehicles{false};
+    bool m_triggerEventDamageCancelledForPeds{false};
+    bool m_triggerEventDamageCancelledForDamageEveryFrame{false};
 };
 
 extern CClientGame* g_pClientGame;

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -5507,10 +5507,13 @@ void CPacketHandler::Packet_SyncSettings(NetBitStreamInterface& bitStream)
     bool triggerEventDamageCancelledForVehicles;
     bitStream.ReadBit(triggerEventDamageCancelledForVehicles);
 
+    bool trigggerEventDamageCancelledForPeds;
+    bitStream.ReadBit(trigggerEventDamageCancelledForPeds);
+
     bool triggerEventDamageCancelledForDamageEveryFrame;
     bitStream.ReadBit(triggerEventDamageCancelledForDamageEveryFrame);
 
-    g_pClientGame->SetEventDamageCancelledSettings(triggerEventDamageCancelledForVehicles, triggerEventDamageCancelledForDamageEveryFrame);
+    g_pClientGame->SetEventDamageCancelledSettings(triggerEventDamageCancelledForVehicles, trigggerEventDamageCancelledForPeds, triggerEventDamageCancelledForDamageEveryFrame);
 
     SMiscGameSettings miscGameSettings;
     miscGameSettings.bUseAltPulseOrder = (ucUseAltPulseOrder != 0);

Server/mods/deathmatch/editor.conf

@@ -304,6 +304,10 @@
           Values: 0 - Off, 1 - Enabled. Default: 0 -->
     <cancelled_damage_for_vehicles>0</cancelled_damage_for_vehicles>
 
+    <!-- This parameter specifies whether the onDamageEventCancelled event should be triggered for peds/players. If you are naturally cancelling onClientPedDamage/onClientPlayerDamage event, it is recommended to leave this parameter set to 0 to avoid unnecessary event flooding.
+          Values: 0 - Off, 1 - Enabled. Default: 0 -->
+    <cancelled_damage_for_peds>0</cancelled_damage_for_peds>
+
     <!-- This parameter specifies whether the onDamageEventCancelled event should be triggered when a ped takes damage every frame (drowning, burning, fire extinguisher, spraycan, runover by car, minigun, chainsaw cutting, teargas). 
           Values: 0 - Off, 1 - Enabled. Default: 1 -->
     <cancelled_damage_send_frame_based_dmg>1</cancelled_damage_send_frame_based_dmg>

Server/mods/deathmatch/local.conf

@@ -310,6 +310,10 @@
           Values: 0 - Off, 1 - Enabled. Default: 0 -->
     <cancelled_damage_for_vehicles>0</cancelled_damage_for_vehicles>
 
+    <!-- This parameter specifies whether the onDamageEventCancelled event should be triggered for peds/players. If you are naturally cancelling onClientPedDamage/onClientPlayerDamage event, it is recommended to leave this parameter set to 0 to avoid unnecessary event flooding.
+          Values: 0 - Off, 1 - Enabled. Default: 0 -->
+    <cancelled_damage_for_peds>0</cancelled_damage_for_peds>
+
     <!-- This parameter specifies whether the onDamageEventCancelled event should be triggered when a ped takes damage every frame (drowning, burning, fire extinguisher, spraycan, runover by car, minigun, chainsaw cutting, teargas). 
           Values: 0 - Off, 1 - Enabled. Default: 1 -->
     <cancelled_damage_send_frame_based_dmg>1</cancelled_damage_send_frame_based_dmg>

Server/mods/deathmatch/logic/CGame.cpp

@@ -4801,7 +4801,7 @@ void CGame::SendSyncSettings(CPlayer* pPlayer)
     const SEVentDamageCancelledSettings& damageCancelledSettings = m_pMainConfig->GetEventDamageCancelledSettings();
 
     CSyncSettingsPacket packet(weaponTypesUsingBulletSync, ucVehExtrapolateEnabled, sVehExtrapolateBaseMs, sVehExtrapolatePercent, sVehExtrapolateMaxMs,
-                               ucUseAltPulseOrder, ucAllowFastSprintFix, ucAllowDrivebyAnimFix, ucAllowShotgunDamageFix, multiCommandHandlerPolicy, damageCancelledSettings.triggerOnVehicleDamage == 1, damageCancelledSettings.triggerForDamageCalledEveryFrame == 1);
+                               ucUseAltPulseOrder, ucAllowFastSprintFix, ucAllowDrivebyAnimFix, ucAllowShotgunDamageFix, multiCommandHandlerPolicy, damageCancelledSettings.triggerOnVehicleDamage == 1, damageCancelledSettings.triggerOnPedDamage == 1, damageCancelledSettings.triggerForDamageCalledEveryFrame == 1);
 
     if (pPlayer)
         pPlayer->Send(packet);

Server/mods/deathmatch/logic/CMainConfig.cpp

@@ -541,6 +541,7 @@ bool CMainConfig::Load()
     m_allowMultiCommandHandlers = Clamp(0, m_allowMultiCommandHandlers, 2);
 
     GetInteger(m_pRootNode, "cancelled_damage_for_vehicles", m_eventDamageCancelledSettings.triggerOnVehicleDamage);
+    GetInteger(m_pRootNode, "cancelled_damage_for_peds", m_eventDamageCancelledSettings.triggerOnPedDamage);
     GetInteger(m_pRootNode, "cancelled_damage_send_frame_based_dmg", m_eventDamageCancelledSettings.triggerForDamageCalledEveryFrame);
 
     ApplyNetOptions();
@@ -1541,7 +1542,8 @@ const std::vector<SIntSetting>& CMainConfig::GetIntSettingList()
         {true, true, 0, 1, 1, "resource_client_file_checks", &m_checkResourceClientFiles, nullptr},
         {true, true, 0, 1, 2, "allow_multi_command_handlers", &m_allowMultiCommandHandlers, &CMainConfig::OnSettingChange},
         {true, true, 0, 0, 1, "cancelled_damage_for_vehicles", &m_eventDamageCancelledSettings.triggerOnVehicleDamage, &CMainConfig::OnSettingChange},
-        {true, true, 0, 1, 1, "cancelled_damage_send_frame_based_dmg", &m_eventDamageCancelledSettings.triggerForDamageCalledEveryFrame, &CMainConfig::OnSettingChange},
+        {true, true, 0, 0, 1, "cancelled_damage_for_peds", &m_eventDamageCancelledSettings.triggerOnPedDamage, &CMainConfig::OnSettingChange},
+        {true, true, 0, 0, 1, "cancelled_damage_send_frame_based_dmg", &m_eventDamageCancelledSettings.triggerForDamageCalledEveryFrame, &CMainConfig::OnSettingChange},
     };
 
     static std::vector<SIntSetting> settingsList;

Server/mods/deathmatch/logic/CMainConfig.h

@@ -42,6 +42,7 @@ struct SIntSetting
 struct SEVentDamageCancelledSettings
 {
     int triggerOnVehicleDamage{false};
+    int triggerOnPedDamage{false};
     int triggerForDamageCalledEveryFrame{true};
 };
 

Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.cpp

@@ -15,7 +15,7 @@
 
 CSyncSettingsPacket::CSyncSettingsPacket(const std::set<eWeaponType>& weaponTypesUsingBulletSync, uchar ucVehExtrapolateEnabled, short sVehExtrapolateBaseMs,
                                          short sVehExtrapolatePercent, short sVehExtrapolateMaxMs, uchar ucUseAltPulseOrder, uchar ucAllowFastSprintFix,
-                                         uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix, std::uint8_t multiCommandHandlerPolicy, bool triggerDamageEventCancelledForVehicles, bool triggerDamageEventCancelledForDamageEveryFrame)
+                                         uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix, std::uint8_t multiCommandHandlerPolicy, bool triggerDamageEventCancelledForVehicles, bool triggerDamageEventCancelledForPeds, bool triggerDamageEventCancelledForDamageEveryFrame)
 {
     m_weaponTypesUsingBulletSync = weaponTypesUsingBulletSync;
     m_ucVehExtrapolateEnabled = ucVehExtrapolateEnabled;
@@ -28,6 +28,7 @@ CSyncSettingsPacket::CSyncSettingsPacket(const std::set<eWeaponType>& weaponType
     m_ucAllowShotgunDamageFix = ucAllowShotgunDamageFix;
     m_multiCommandHandlerPolicy = multiCommandHandlerPolicy;
     m_triggerDamageEventCancelledForVehicles = triggerDamageEventCancelledForVehicles;
+    m_triggerEventDamageCancelledForPeds = triggerDamageEventCancelledForPeds;
     m_triggerDamageEventCancelledForDamageEveryFrame = triggerDamageEventCancelledForDamageEveryFrame;
 }
 
@@ -56,6 +57,7 @@ bool CSyncSettingsPacket::Write(NetBitStreamInterface& BitStream) const
     BitStream.Write(m_ucAllowShotgunDamageFix);
     BitStream.Write(m_multiCommandHandlerPolicy);
     BitStream.WriteBit(m_triggerDamageEventCancelledForVehicles);
+    BitStream.WriteBit(m_triggerEventDamageCancelledForPeds);
     BitStream.WriteBit(m_triggerDamageEventCancelledForDamageEveryFrame);
     return true;
 }

Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h

@@ -19,7 +19,7 @@ class CSyncSettingsPacket final : public CPacket
     CSyncSettingsPacket(){};
     CSyncSettingsPacket(const std::set<eWeaponType>& weaponTypesUsingBulletSync, uchar ucVehExtrapolateEnabled, short sVehExtrapolateBaseMs,
                         short sVehExtrapolatePercent, short sVehExtrapolateMaxMs, uchar ucUseAltPulseOrder, uchar ucAllowFastSprintFix,
-                        uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix, std::uint8_t multiCommandHandlerPolicy, bool triggerDamageEventCancelledForVehicles, bool triggerDamageEventCancelledForDamageEveryFrame);
+                        uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix, std::uint8_t multiCommandHandlerPolicy, bool triggerDamageEventCancelledForVehicles, bool triggerDamageEventCancelledForPeds, bool triggerDamageEventCancelledForDamageEveryFrame);
 
     ePacketID     GetPacketID() const { return PACKET_ID_SYNC_SETTINGS; };
     unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; };
@@ -37,6 +37,7 @@ class CSyncSettingsPacket final : public CPacket
     uchar                 m_ucAllowDrivebyAnimationFix;
     uchar                 m_ucAllowShotgunDamageFix;
     std::uint8_t          m_multiCommandHandlerPolicy;
-    bool                  m_triggerDamageEventCancelledForVehicles;
-    bool                  m_triggerDamageEventCancelledForDamageEveryFrame;
+    bool                  m_triggerDamageEventCancelledForVehicles{};
+    bool                  m_triggerEventDamageCancelledForPeds{};
+    bool                  m_triggerDamageEventCancelledForDamageEveryFrame{};
 };