File tree Expand file tree Collapse file tree 2 files changed +13
-0
lines changed
GeneralsMD/Code/GameEngine/Source/GameLogic/Object
Generals/Code/GameEngine/Source/GameLogic/Object Expand file tree Collapse file tree 2 files changed +13
-0
lines changed Original file line number Diff line number Diff line change @@ -2881,6 +2881,10 @@ Bool Object::isAbleToAttack() const
28812881 if ( testStatus (OBJECT_STATUS_SOLD) )
28822882 return false ;
28832883
2884+ // TheSuperHackers @bugfix bobtista 31/10/2025 Fixes Gatling Cannon barrels rotating despite insufficient energy.
2885+ if ( isKindOf ( KINDOF_POWERED ) && isDisabledByType ( DISABLED_UNDERPOWERED ) )
2886+ return false ;
2887+
28842888 // We can't fire if we, as a portable structure, are aptly disabled
28852889 if ( isKindOf ( KINDOF_PORTABLE_STRUCTURE ) || isKindOf ( KINDOF_SPAWNS_ARE_THE_WEAPONS ))
28862890 {
@@ -4150,6 +4154,11 @@ void Object::adjustModelConditionForWeaponStatus()
41504154 // we really don't care, so we just force the issue here. (This might still need tweaking for the pursue state.)
41514155 conditionToSet = WSF_NONE;
41524156 }
4157+ // TheSuperHackers @bugfix bobtista 11/11/2025 Prevent barrel animation when powered structures are underpowered.
4158+ else if ( isKindOf ( KINDOF_POWERED ) && isDisabledByType ( DISABLED_UNDERPOWERED ) )
4159+ {
4160+ conditionToSet = WSF_NONE;
4161+ }
41534162 else
41544163 {
41554164 WeaponStatus newStatus = w->getStatus ();
Original file line number Diff line number Diff line change @@ -3200,6 +3200,10 @@ 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)
3204+ if ( isKindOf ( KINDOF_POWERED ) && isDisabledByType ( DISABLED_UNDERPOWERED ) )
3205+ return false ;
3206+
32033207 // We can't fire if we, as a portable structure, are aptly disabled
32043208 if ( isKindOf ( KINDOF_PORTABLE_STRUCTURE ) || isKindOf ( KINDOF_SPAWNS_ARE_THE_WEAPONS ))
32053209 {
You can’t perform that action at this time.
0 commit comments