Skip to content

Commit 9e4d4a2

Browse files
Stubbjaxxezon
authored andcommitted
unify(object): Merge the missing veterancy effect fix for detected stealth units from Zero Hour (#1455)
1 parent 620460d commit 9e4d4a2

File tree

1 file changed

+7
-2
lines changed
  • Generals/Code/GameEngine/Source/GameLogic/Object

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2775,8 +2775,13 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
27752775
if (body)
27762776
body->onVeterancyLevelChanged(oldLevel, newLevel, provideFeedback);
27772777

2778-
2779-
Bool hideAnimationForStealth = ( ! isLocallyControlled() && testStatus(OBJECT_STATUS_STEALTHED));
2778+
Bool hideAnimationForStealth = FALSE;
2779+
if( !isLocallyControlled() &&
2780+
testStatus( OBJECT_STATUS_STEALTHED ) &&
2781+
!testStatus( OBJECT_STATUS_DETECTED ) )
2782+
{
2783+
hideAnimationForStealth = TRUE;
2784+
}
27802785

27812786
Bool doAnimation = ( ! hideAnimationForStealth
27822787
&& (newLevel > oldLevel)

0 commit comments

Comments
 (0)