refactor: Split veterancy effect logic

Stubbjax · Stubbjax · commit 4227b45b2a82 · 2025-12-22T09:13:10.000+11:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h
@@ -213,6 +213,7 @@ class Object : public Thing, public Snapshot
 
 	void scoreTheKill( const Object *victim );						///< I just killed this object.
 	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE );	///< I just achieved this level right this moment
+	void createVeterancyLevelFX(VeterancyLevel oldLevel, VeterancyLevel newLevel);
 	ExperienceTracker* getExperienceTracker() {return m_experienceTracker;}
 	const ExperienceTracker* getExperienceTracker() const {return m_experienceTracker;}
 	VeterancyLevel getVeterancyLevel() const;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -2849,12 +2849,18 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 		&& outerDrawable
 		&& outerDrawable->isVisible();
 
+	if (doAnimation)
+		createVeterancyLevelFX(oldLevel, newLevel);
+}
+
+void Object::createVeterancyLevelFX(VeterancyLevel oldLevel, VeterancyLevel newLevel)
+{
 #if RETAIL_COMPATIBLE_CRC
 	if (isEffectivelyDead())
 		return;
 #endif
 
-	if( doAnimation && TheGameLogic->getDrawIconUI() )
+	if (TheGameLogic->getDrawIconUI())
 	{
 		if( TheAnim2DCollection && TheGlobalData->m_levelGainAnimationName.isEmpty() == FALSE )
 		{
@@ -2874,7 +2880,6 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 		soundToPlay.setObjectID( getID() );
 		TheAudio->addAudioEvent( &soundToPlay );
 	}
-
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -229,6 +229,7 @@ class Object : public Thing, public Snapshot
 
 	void scoreTheKill( const Object *victim );						///< I just killed this object.
 	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE );	///< I just achieved this level right this moment
+	void createVeterancyLevelFX(VeterancyLevel oldLevel, VeterancyLevel newLevel);
 	ExperienceTracker* getExperienceTracker() {return m_experienceTracker;}
 	const ExperienceTracker* getExperienceTracker() const {return m_experienceTracker;}
 	VeterancyLevel getVeterancyLevel() const;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -3164,12 +3164,18 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 		&& outerDrawable
 		&& outerDrawable->isVisible();
 
+	if (doAnimation)
+		createVeterancyLevelFX(oldLevel, newLevel);
+}
+
+void Object::createVeterancyLevelFX(VeterancyLevel oldLevel, VeterancyLevel newLevel)
+{
 #if RETAIL_COMPATIBLE_CRC
 	if (isEffectivelyDead())
 		return;
 #endif
 
-	if( doAnimation && TheGameLogic->getDrawIconUI() )
+	if (TheGameLogic->getDrawIconUI())
 	{
 		if( TheAnim2DCollection && TheGlobalData->m_levelGainAnimationName.isEmpty() == FALSE )
 		{
@@ -3189,7 +3195,6 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 		soundToPlay.setObjectID( getID() );
 		TheAudio->addAudioEvent( &soundToPlay );
 	}
-
 }
 
 //-------------------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -2849,12 +2849,18 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne`
`2849`	`2849`	`&& outerDrawable`
`2850`	`2850`	`&& outerDrawable->isVisible();`
`2851`	`2851`
	`2852`	`+ if (doAnimation)`
	`2853`	`+ createVeterancyLevelFX(oldLevel, newLevel);`
	`2854`	`+}`
	`2855`	`+`
	`2856`	`+void Object::createVeterancyLevelFX(VeterancyLevel oldLevel, VeterancyLevel newLevel)`
	`2857`	`+{`
`2852`	`2858`	`#if RETAIL_COMPATIBLE_CRC`
`2853`	`2859`	`if (isEffectivelyDead())`
`2854`	`2860`	`return;`
`2855`	`2861`	`#endif`
`2856`	`2862`
`2857`		`- if( doAnimation && TheGameLogic->getDrawIconUI() )`
	`2863`	`+ if (TheGameLogic->getDrawIconUI())`
`2858`	`2864`	`{`
`2859`	`2865`	`if( TheAnim2DCollection && TheGlobalData->m_levelGainAnimationName.isEmpty() == FALSE )`
`2860`	`2866`	`{`
`@@ -2874,7 +2880,6 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne`
`2874`	`2880`	`soundToPlay.setObjectID( getID() );`
`2875`	`2881`	`TheAudio->addAudioEvent( &soundToPlay );`
`2876`	`2882`	`}`
`2877`		`-`
`2878`	`2883`	`}`
`2879`	`2884`
`2880`	`2885`	`//-------------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -3164,12 +3164,18 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne`
`3164`	`3164`	`&& outerDrawable`
`3165`	`3165`	`&& outerDrawable->isVisible();`
`3166`	`3166`
	`3167`	`+ if (doAnimation)`
	`3168`	`+ createVeterancyLevelFX(oldLevel, newLevel);`
	`3169`	`+}`
	`3170`	`+`
	`3171`	`+void Object::createVeterancyLevelFX(VeterancyLevel oldLevel, VeterancyLevel newLevel)`
	`3172`	`+{`
`3167`	`3173`	`#if RETAIL_COMPATIBLE_CRC`
`3168`	`3174`	`if (isEffectivelyDead())`
`3169`	`3175`	`return;`
`3170`	`3176`	`#endif`
`3171`	`3177`
`3172`		`- if( doAnimation && TheGameLogic->getDrawIconUI() )`
	`3178`	`+ if (TheGameLogic->getDrawIconUI())`
`3173`	`3179`	`{`
`3174`	`3180`	`if( TheAnim2DCollection && TheGlobalData->m_levelGainAnimationName.isEmpty() == FALSE )`
`3175`	`3181`	`{`
`@@ -3189,7 +3195,6 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne`
`3189`	`3195`	`soundToPlay.setObjectID( getID() );`
`3190`	`3196`	`TheAudio->addAudioEvent( &soundToPlay );`
`3191`	`3197`	`}`
`3192`		`-`
`3193`	`3198`	`}`
`3194`	`3199`
`3195`	`3200`	`//-------------------------------------------------------------------------------------------------`