tweak: Cache outer drawable

Stubbjax · Stubbjax · commit 1be8dc72234b · 2025-11-20T00:55:42.000+11:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -2829,11 +2829,13 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 			break;
 	}
 
+	Drawable* outerDrawable = getOuterObject()->getDrawable();
+
 	Bool doAnimation = provideFeedback
 		&& newLevel > oldLevel
 		&& !isKindOf(KINDOF_IGNORED_IN_GUI)
-		&& getOuterObject()->getDrawable()
-		&& getOuterObject()->getDrawable()->isVisible();
+		&& outerDrawable
+		&& outerDrawable->isVisible();
 
 	if( doAnimation && TheGameLogic->getDrawIconUI() )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -3144,11 +3144,13 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 			break;
 	}
 
+	Drawable* outerDrawable = getOuterObject()->getDrawable();
+
 	Bool doAnimation = provideFeedback
 		&& newLevel > oldLevel
 		&& !isKindOf(KINDOF_IGNORED_IN_GUI)
-		&& getOuterObject()->getDrawable()
-		&& getOuterObject()->getDrawable()->isVisible();
+		&& outerDrawable
+		&& outerDrawable->isVisible();
 
 	if( doAnimation && TheGameLogic->getDrawIconUI() )
 	{

Original file line number	Diff line number	Diff line change
`@@ -2829,11 +2829,13 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne`
`2829`	`2829`	`break;`
`2830`	`2830`	`}`
`2831`	`2831`
	`2832`	`+ Drawable* outerDrawable = getOuterObject()->getDrawable();`
	`2833`	`+`
`2832`	`2834`	`Bool doAnimation = provideFeedback`
`2833`	`2835`	`&& newLevel > oldLevel`
`2834`	`2836`	`&& !isKindOf(KINDOF_IGNORED_IN_GUI)`
`2835`		`- && getOuterObject()->getDrawable()`
`2836`		`- && getOuterObject()->getDrawable()->isVisible();`
	`2837`	`+ && outerDrawable`
	`2838`	`+ && outerDrawable->isVisible();`
`2837`	`2839`
`2838`	`2840`	`if( doAnimation && TheGameLogic->getDrawIconUI() )`
`2839`	`2841`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3144,11 +3144,13 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne`
`3144`	`3144`	`break;`
`3145`	`3145`	`}`
`3146`	`3146`
	`3147`	`+ Drawable* outerDrawable = getOuterObject()->getDrawable();`
	`3148`	`+`
`3147`	`3149`	`Bool doAnimation = provideFeedback`
`3148`	`3150`	`&& newLevel > oldLevel`
`3149`	`3151`	`&& !isKindOf(KINDOF_IGNORED_IN_GUI)`
`3150`		`- && getOuterObject()->getDrawable()`
`3151`		`- && getOuterObject()->getDrawable()->isVisible();`
	`3152`	`+ && outerDrawable`
	`3153`	`+ && outerDrawable->isVisible();`
`3152`	`3154`
`3153`	`3155`	`if( doAnimation && TheGameLogic->getDrawIconUI() )`
`3154`	`3156`	`{`