perf(fps): move hero counter updates to match stealth counter pattern"

bobtista · bobtista · commit df4e5795e3cb · 2025-12-15T17:43:17.000-05:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
@@ -155,9 +155,7 @@ class ContainModuleInterface
 	virtual const Object *friend_getRider() const = 0; ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 	virtual Real getContainedItemsMass() const = 0;
 	virtual UnsignedInt getStealthUnitsContained() const = 0;
-#if !RETAIL_COMPATIBLE_CRC
 	virtual UnsignedInt getHeroUnitsContained() const = 0;
-#endif
 
 	virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) = 0;
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) = 0;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
@@ -353,6 +353,10 @@ void OpenContain::addToContainList( Object *rider )
 	{
 		m_stealthUnitsContained++;
 	}
+	if( rider->isKindOf( KINDOF_HERO ) )
+	{
+		m_heroUnitsContained++;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -543,6 +547,10 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 			}
 		}
 	}
+	if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )
+	{
+		m_heroUnitsContained--;
+	}
 
 
 	if (isEnclosingContainerFor( rider ))
@@ -630,11 +638,6 @@ void OpenContain::onContaining( Object *rider )
 		enterSound.setObjectID(getObject()->getID());
 		TheAudio->addAudioEvent(&enterSound);
 	}
-
-	if( rider && rider->isKindOf( KINDOF_HERO ) )
-	{
-		m_heroUnitsContained++;
-	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -650,11 +653,6 @@ void OpenContain::onRemoving( Object *rider)
 		AudioEventRTS fallingSound = *rider->getTemplate()->getSoundFalling();
 		fallingSound.setObjectID(rider->getID());
 		TheAudio->addAudioEvent(&fallingSound);
-
-		if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )
-		{
-			m_heroUnitsContained--;
-		}
 	}
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -592,40 +592,17 @@ Object::~Object()
 	TheScriptEngine->notifyOfObjectDestruction(this);
 }
 
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-#if RETAIL_COMPATIBLE_CRC
-void localIsHero( Object *obj, void* userData )
-{
-	Bool *hero = (Bool*)userData;
-
-	if( obj && obj->isKindOf( KINDOF_HERO ) )
-	{
-		*hero = TRUE;
-	}
-}
-#endif
-
 //-------------------------------------------------------------------------------------------------
 // TheSuperHackers @performance bobtista 13/11/2025 Use cached hero count for O(1) lookup instead of O(n) iteration.
 Bool Object::isHero() const
 {
 	ContainModuleInterface *contain = getContain();
 	if( contain )
 	{
-#if !RETAIL_COMPATIBLE_CRC
 		if( contain->getHeroUnitsContained() > 0 )
 		{
 			return TRUE;
 		}
-#else
-		Bool heroInside = FALSE;
-		contain->iterateContained( localIsHero, (void*)(&heroInside), FALSE );
-		if( heroInside )
-		{
-			return TRUE;
-		}
-#endif
 	}
 	return isKindOf( KINDOF_HERO );
 }
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
@@ -175,9 +175,7 @@ class ContainModuleInterface
 	virtual const Object *friend_getRider() const = 0; ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 	virtual Real getContainedItemsMass() const = 0;
 	virtual UnsignedInt getStealthUnitsContained() const = 0;
-#if !RETAIL_COMPATIBLE_CRC
 	virtual UnsignedInt getHeroUnitsContained() const = 0;
-#endif
 
 	virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) = 0;
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) = 0;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
@@ -375,6 +375,10 @@ void OpenContain::addToContainList( Object *rider )
 	{
 		m_stealthUnitsContained++;
 	}
+	if( rider->isKindOf( KINDOF_HERO ) )
+	{
+		m_heroUnitsContained++;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -661,6 +665,10 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 			}
 		}
 	}
+	if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )
+	{
+		m_heroUnitsContained--;
+	}
 
 
 	if (isEnclosingContainerFor( rider ))
@@ -750,11 +758,6 @@ void OpenContain::onContaining( Object *rider, Bool wasSelected )
 		enterSound.setObjectID(getObject()->getID());
 		TheAudio->addAudioEvent(&enterSound);
 	}
-
-	if( rider && rider->isKindOf( KINDOF_HERO ) )
-	{
-		m_heroUnitsContained++;
-	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -770,11 +773,6 @@ void OpenContain::onRemoving( Object *rider)
 		AudioEventRTS fallingSound = *rider->getTemplate()->getSoundFalling();
 		fallingSound.setObjectID(rider->getID());
 		TheAudio->addAudioEvent(&fallingSound);
-
-		if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )
-		{
-			m_heroUnitsContained--;
-		}
 	}
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -2042,39 +2042,17 @@ Bool Object::isNonFactionStructure(void) const
 	return isStructure() && !isFactionStructure();
 }
 
-//-------------------------------------------------------------------------------------------------
-#if RETAIL_COMPATIBLE_CRC
-void localIsHero( Object *obj, void* userData )
-{
-	Bool *hero = (Bool*)userData;
-
-	if( obj && obj->isKindOf( KINDOF_HERO ) )
-	{
-		*hero = TRUE;
-	}
-}
-#endif
-
 //-------------------------------------------------------------------------------------------------
 // TheSuperHackers @performance bobtista 13/11/2025 Use cached hero count for O(1) lookup instead of O(n) iteration.
 Bool Object::isHero(void) const
 {
 	ContainModuleInterface *contain = getContain();
 	if( contain )
 	{
-#if !RETAIL_COMPATIBLE_CRC
 		if( contain->getHeroUnitsContained() > 0 )
 		{
 			return TRUE;
 		}
-#else
-		Bool heroInside = FALSE;
-		contain->iterateContained( localIsHero, (void*)(&heroInside), FALSE );
-		if( heroInside )
-		{
-			return TRUE;
-		}
-#endif
 	}
 	return isKindOf( KINDOF_HERO );
 }

Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,10 @@ void OpenContain::addToContainList( Object *rider )`
`353`	`353`	`{`
`354`	`354`	`m_stealthUnitsContained++;`
`355`	`355`	`}`
	`356`	`+ if( rider->isKindOf( KINDOF_HERO ) )`
	`357`	`+ {`
	`358`	`+ m_heroUnitsContained++;`
	`359`	`+ }`
`356`	`360`	`}`
`357`	`361`
`358`	`362`	`//-------------------------------------------------------------------------------------------------`
`@@ -543,6 +547,10 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,`
`543`	`547`	`}`
`544`	`548`	`}`
`545`	`549`	`}`
	`550`	`+ if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
	`551`	`+ {`
	`552`	`+ m_heroUnitsContained--;`
	`553`	`+ }`
`546`	`554`
`547`	`555`
`548`	`556`	`if (isEnclosingContainerFor( rider ))`
`@@ -630,11 +638,6 @@ void OpenContain::onContaining( Object *rider )`
`630`	`638`	`enterSound.setObjectID(getObject()->getID());`
`631`	`639`	`TheAudio->addAudioEvent(&enterSound);`
`632`	`640`	`}`
`633`		`-`
`634`		`- if( rider && rider->isKindOf( KINDOF_HERO ) )`
`635`		`- {`
`636`		`- m_heroUnitsContained++;`
`637`		`- }`
`638`	`641`	`}`
`639`	`642`
`640`	`643`	`//-------------------------------------------------------------------------------------------------`
`@@ -650,11 +653,6 @@ void OpenContain::onRemoving( Object *rider)`
`650`	`653`	`AudioEventRTS fallingSound = *rider->getTemplate()->getSoundFalling();`
`651`	`654`	`fallingSound.setObjectID(rider->getID());`
`652`	`655`	`TheAudio->addAudioEvent(&fallingSound);`
`653`		`-`
`654`		`- if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
`655`		`- {`
`656`		`- m_heroUnitsContained--;`
`657`		`- }`
`658`	`656`	`}`
`659`	`657`	`}`
`660`	`658`
Original file line number	Diff line number	Diff line change
`@@ -375,6 +375,10 @@ void OpenContain::addToContainList( Object *rider )`
`375`	`375`	`{`
`376`	`376`	`m_stealthUnitsContained++;`
`377`	`377`	`}`
	`378`	`+ if( rider->isKindOf( KINDOF_HERO ) )`
	`379`	`+ {`
	`380`	`+ m_heroUnitsContained++;`
	`381`	`+ }`
`378`	`382`	`}`
`379`	`383`
`380`	`384`	`//-------------------------------------------------------------------------------------------------`
`@@ -661,6 +665,10 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,`
`661`	`665`	`}`
`662`	`666`	`}`
`663`	`667`	`}`
	`668`	`+ if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
	`669`	`+ {`
	`670`	`+ m_heroUnitsContained--;`
	`671`	`+ }`
`664`	`672`
`665`	`673`
`666`	`674`	`if (isEnclosingContainerFor( rider ))`
`@@ -750,11 +758,6 @@ void OpenContain::onContaining( Object *rider, Bool wasSelected )`
`750`	`758`	`enterSound.setObjectID(getObject()->getID());`
`751`	`759`	`TheAudio->addAudioEvent(&enterSound);`
`752`	`760`	`}`
`753`		`-`
`754`		`- if( rider && rider->isKindOf( KINDOF_HERO ) )`
`755`		`- {`
`756`		`- m_heroUnitsContained++;`
`757`		`- }`
`758`	`761`	`}`
`759`	`762`
`760`	`763`	`//-------------------------------------------------------------------------------------------------`
`@@ -770,11 +773,6 @@ void OpenContain::onRemoving( Object *rider)`
`770`	`773`	`AudioEventRTS fallingSound = *rider->getTemplate()->getSoundFalling();`
`771`	`774`	`fallingSound.setObjectID(rider->getID());`
`772`	`775`	`TheAudio->addAudioEvent(&fallingSound);`
`773`		`-`
`774`		`- if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
`775`		`- {`
`776`		`- m_heroUnitsContained--;`
`777`		`- }`
`778`	`776`	`}`
`779`	`777`	`}`
`780`	`778`
Original file line number	Diff line number	Diff line change
`@@ -2042,39 +2042,17 @@ Bool Object::isNonFactionStructure(void) const`
`2042`	`2042`	`return isStructure() && !isFactionStructure();`
`2043`	`2043`	`}`
`2044`	`2044`
`2045`		`-//-------------------------------------------------------------------------------------------------`
`2046`		`-#if RETAIL_COMPATIBLE_CRC`
`2047`		`-void localIsHero( Object obj, void userData )`
`2048`		`-{`
`2049`		`- Bool hero = (Bool)userData;`
`2050`		`-`
`2051`		`- if( obj && obj->isKindOf( KINDOF_HERO ) )`
`2052`		`- {`
`2053`		`- *hero = TRUE;`
`2054`		`- }`
`2055`		`-}`
`2056`		`-#endif`
`2057`		`-`
`2058`	`2045`	`//-------------------------------------------------------------------------------------------------`
`2059`	`2046`	`// TheSuperHackers @performance bobtista 13/11/2025 Use cached hero count for O(1) lookup instead of O(n) iteration.`
`2060`	`2047`	`Bool Object::isHero(void) const`
`2061`	`2048`	`{`
`2062`	`2049`	`ContainModuleInterface *contain = getContain();`
`2063`	`2050`	`if( contain )`
`2064`	`2051`	`{`
`2065`		`-#if !RETAIL_COMPATIBLE_CRC`
`2066`	`2052`	`if( contain->getHeroUnitsContained() > 0 )`
`2067`	`2053`	`{`
`2068`	`2054`	`return TRUE;`
`2069`	`2055`	`}`
`2070`		`-#else`
`2071`		`- Bool heroInside = FALSE;`
`2072`		`- contain->iterateContained( localIsHero, (void*)(&heroInside), FALSE );`
`2073`		`- if( heroInside )`
`2074`		`- {`
`2075`		`- return TRUE;`
`2076`		`- }`
`2077`		`-#endif`
`2078`	`2056`	`}`
`2079`	`2057`	`return isKindOf( KINDOF_HERO );`
`2080`	`2058`	`}`