refactor: Condense animation conditions

Author: Stubbjax

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

@@ -2775,22 +2775,12 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 	if (body)
 		body->onVeterancyLevelChanged(oldLevel, newLevel, provideFeedback);
 
-	Bool hideAnimationForStealth = FALSE;
-	Bool doAnimation = FALSE;
-
-	if (provideFeedback)
-	{
-		if( !isLocallyControlled() &&
-				testStatus( OBJECT_STATUS_STEALTHED ) &&
-				!testStatus( OBJECT_STATUS_DETECTED ) )
-		{
-			hideAnimationForStealth = TRUE;
-		}
-
-		doAnimation = ( ! hideAnimationForStealth
-									&& (newLevel > oldLevel)
-									&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
-	}
+	Bool doAnimation = provideFeedback
+		&& newLevel > oldLevel
+		&& !isKindOf(KINDOF_IGNORED_IN_GUI)
+		&& (isLocallyControlled()
+			|| !testStatus(OBJECT_STATUS_STEALTHED)
+			|| testStatus(OBJECT_STATUS_DETECTED));
 
 	switch (newLevel)
 	{
@@ -2829,7 +2819,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 			break;
 	}
 
-	if( doAnimation && TheGameLogic->getDrawIconUI() && provideFeedback )
+	if( doAnimation && TheGameLogic->getDrawIconUI() )
 	{
 		if( TheAnim2DCollection && TheGlobalData->m_levelGainAnimationName.isEmpty() == FALSE )
 		{

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

@@ -3090,23 +3090,13 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 	if (body)
 		body->onVeterancyLevelChanged( oldLevel, newLevel, provideFeedback );
 
-	Bool hideAnimationForStealth = FALSE;
-	Bool doAnimation = FALSE;
-
-	if (provideFeedback)
-	{
-		if( !isLocallyControlled() &&
-				testStatus( OBJECT_STATUS_STEALTHED ) &&
-				!testStatus( OBJECT_STATUS_DETECTED ) &&
-				!testStatus( OBJECT_STATUS_DISGUISED ) )
-		{
-			hideAnimationForStealth = TRUE;
-		}
-
-		doAnimation = ( ! hideAnimationForStealth
-									&& (newLevel > oldLevel)
-									&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
-	}
+	Bool doAnimation = provideFeedback
+		&& newLevel > oldLevel
+		&& !isKindOf(KINDOF_IGNORED_IN_GUI)
+		&& (isLocallyControlled()
+			|| !testStatus(OBJECT_STATUS_STEALTHED)
+			|| testStatus(OBJECT_STATUS_DETECTED)
+			|| testStatus(OBJECT_STATUS_DISGUISED));
 
 	switch (newLevel)
 	{
@@ -3145,7 +3135,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 			break;
 	}
 
-	if( doAnimation && TheGameLogic->getDrawIconUI() && provideFeedback )
+	if( doAnimation && TheGameLogic->getDrawIconUI() )
 	{
 		if( TheAnim2DCollection && TheGlobalData->m_levelGainAnimationName.isEmpty() == FALSE )
 		{