Skip to content

Commit e8b36a1

Browse files
committed
bugfix: Add CRC guard for Gatling Cannon barrel animation fix
1 parent abbbb22 commit e8b36a1

File tree

2 files changed

+14
-1
lines changed
  • GeneralsMD/Code/GameEngine/Source/GameLogic/Object
  • Generals/Code/GameEngine/Source/GameLogic/Object

2 files changed

+14
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2882,8 +2882,10 @@ Bool Object::isAbleToAttack() const
28822882
return false;
28832883

28842884
// TheSuperHackers @bugfix bobtista 31/10/2025 Fixes Gatling Cannon barrels rotating despite insufficient energy.
2885+
#if !RETAIL_COMPATIBLE_CRC
28852886
if ( isKindOf( KINDOF_POWERED ) && isDisabledByType( DISABLED_UNDERPOWERED ) )
28862887
return false;
2888+
#endif
28872889

28882890
//We can't fire if we, as a portable structure, are aptly disabled
28892891
if ( isKindOf( KINDOF_PORTABLE_STRUCTURE ) || isKindOf( KINDOF_SPAWNS_ARE_THE_WEAPONS ))
@@ -4155,10 +4157,12 @@ void Object::adjustModelConditionForWeaponStatus()
41554157
conditionToSet = WSF_NONE;
41564158
}
41574159
// TheSuperHackers @bugfix bobtista 11/11/2025 Prevent barrel animation when powered structures are underpowered.
4160+
#if !RETAIL_COMPATIBLE_CRC
41584161
else if ( isKindOf( KINDOF_POWERED ) && isDisabledByType( DISABLED_UNDERPOWERED ) )
41594162
{
41604163
conditionToSet = WSF_NONE;
41614164
}
4165+
#endif
41624166
else
41634167
{
41644168
WeaponStatus newStatus = w->getStatus();

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3200,9 +3200,11 @@ Bool Object::isAbleToAttack() const
32003200
if ( isDisabledByType( DISABLED_SUBDUED ) )
32013201
return FALSE; // A Microwave Tank is cooking me
32023202

3203-
// TheSuperHackers @bugfix bobtista 31/10/2025 Fixes Gatling Cannon barrels rotating despite insufficient energy. (#1700)
3203+
// TheSuperHackers @bugfix bobtista 31/10/2025 Fixes Gatling Cannon barrels rotating despite insufficient energy.
3204+
#if !RETAIL_COMPATIBLE_CRC
32043205
if ( isKindOf( KINDOF_POWERED ) && isDisabledByType( DISABLED_UNDERPOWERED ) )
32053206
return false;
3207+
#endif
32063208

32073209
//We can't fire if we, as a portable structure, are aptly disabled
32083210
if ( isKindOf( KINDOF_PORTABLE_STRUCTURE ) || isKindOf( KINDOF_SPAWNS_ARE_THE_WEAPONS ))
@@ -4719,6 +4721,13 @@ void Object::adjustModelConditionForWeaponStatus()
47194721
// we really don't care, so we just force the issue here. (This might still need tweaking for the pursue state.)
47204722
conditionToSet = WSF_NONE;
47214723
}
4724+
// TheSuperHackers @bugfix bobtista 11/11/2025 Prevent barrel animation when powered structures are underpowered.
4725+
#if !RETAIL_COMPATIBLE_CRC
4726+
else if ( isKindOf( KINDOF_POWERED ) && isDisabledByType( DISABLED_UNDERPOWERED ) )
4727+
{
4728+
conditionToSet = WSF_NONE;
4729+
}
4730+
#endif
47224731
else
47234732
{
47244733
WeaponStatus newStatus = w->getStatus();

0 commit comments

Comments
 (0)