refactor: Only evaluate animation conditions if provide-feedback is true

Author: Stubbjax

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

@@ -2776,16 +2776,21 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 		body->onVeterancyLevelChanged(oldLevel, newLevel, provideFeedback);
 
 	Bool hideAnimationForStealth = FALSE;
-	if( !isLocallyControlled() &&
-			testStatus( OBJECT_STATUS_STEALTHED ) &&
-			!testStatus( OBJECT_STATUS_DETECTED ) )
+	Bool doAnimation = FALSE;
+
+	if (provideFeedback)
 	{
-		hideAnimationForStealth = TRUE;
-	}
+		if( !isLocallyControlled() &&
+				testStatus( OBJECT_STATUS_STEALTHED ) &&
+				!testStatus( OBJECT_STATUS_DETECTED ) )
+		{
+			hideAnimationForStealth = TRUE;
+		}
 
-	Bool doAnimation = ( ! hideAnimationForStealth
-											&& (newLevel > oldLevel)
-											&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
+		doAnimation = ( ! hideAnimationForStealth
+									&& (newLevel > oldLevel)
+									&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
+	}
 
 	switch (newLevel)
 	{

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

@@ -3091,17 +3091,22 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 		body->onVeterancyLevelChanged( oldLevel, newLevel, provideFeedback );
 
 	Bool hideAnimationForStealth = FALSE;
-	if( !isLocallyControlled() &&
-			testStatus( OBJECT_STATUS_STEALTHED ) &&
-			!testStatus( OBJECT_STATUS_DETECTED ) &&
-			!testStatus( OBJECT_STATUS_DISGUISED ) )
+	Bool doAnimation = FALSE;
+
+	if (provideFeedback)
 	{
-		hideAnimationForStealth = TRUE;
-	}
+		if( !isLocallyControlled() &&
+				testStatus( OBJECT_STATUS_STEALTHED ) &&
+				!testStatus( OBJECT_STATUS_DETECTED ) &&
+				!testStatus( OBJECT_STATUS_DISGUISED ) )
+		{
+			hideAnimationForStealth = TRUE;
+		}
 
-	Bool doAnimation = ( ! hideAnimationForStealth
-											&& (newLevel > oldLevel)
-											&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
+		doAnimation = ( ! hideAnimationForStealth
+									&& (newLevel > oldLevel)
+									&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
+	}
 
 	switch (newLevel)
 	{