Skip to content

Commit 8db4ba7

Browse files
committed
bugfix: Remove redundant weapon bonus condition clearing in forceCoolDown calls
1 parent cb40483 commit 8db4ba7

File tree

2 files changed

+0
-10
lines changed
  • GeneralsMD/Code/GameEngine/Source/GameLogic/Object
  • Generals/Code/GameEngine/Source/GameLogic/Object

2 files changed

+0
-10
lines changed

Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2018,11 +2018,6 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
20182018
// TheSuperHackers @bugfix bobtista 21/12/2025 Force FiringTracker to cool down immediately when power is lost to prevent delayed barrel animations.
20192019
if (m_firingTracker && (type == DISABLED_UNDERPOWERED || type == DISABLED_EMP || type == DISABLED_HACKED))
20202020
{
2021-
if (testWeaponBonusCondition(WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN) || testWeaponBonusCondition(WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST))
2022-
{
2023-
clearWeaponBonusCondition(WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN);
2024-
clearWeaponBonusCondition(WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST);
2025-
}
20262021
m_firingTracker->forceCoolDown();
20272022
}
20282023

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,11 +2250,6 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
22502250
// TheSuperHackers @bugfix bobtista 21/12/2025 Force FiringTracker to cool down immediately when power is lost to prevent delayed barrel animations.
22512251
if (m_firingTracker && (type == DISABLED_UNDERPOWERED || type == DISABLED_EMP || type == DISABLED_SUBDUED || type == DISABLED_HACKED))
22522252
{
2253-
if (testWeaponBonusCondition(WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN) || testWeaponBonusCondition(WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST))
2254-
{
2255-
clearWeaponBonusCondition(WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN);
2256-
clearWeaponBonusCondition(WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST);
2257-
}
22582253
m_firingTracker->forceCoolDown();
22592254
}
22602255

0 commit comments

Comments
 (0)