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

bobtista · bobtista · commit 4482d0817b1e · 2025-12-15T17:32:03.000-05:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
@@ -356,6 +356,10 @@ void OpenContain::addToContainList( Object *rider )
 	{
 		m_stealthUnitsContained++;
 	}
+	if( rider->isKindOf( KINDOF_HERO ) )
+	{
+		m_heroUnitsContained++;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -546,6 +550,10 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 			}
 		}
 	}
+	if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )
+	{
+		m_heroUnitsContained--;
+	}
 
 
 	if (isEnclosingContainerFor( rider ))
@@ -633,11 +641,6 @@ void OpenContain::onContaining( Object *rider )
 		enterSound.setObjectID(getObject()->getID());
 		TheAudio->addAudioEvent(&enterSound);
 	}
-
-	if( rider && rider->isKindOf( KINDOF_HERO ) )
-	{
-		m_heroUnitsContained++;
-	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -653,11 +656,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/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
@@ -378,6 +378,10 @@ void OpenContain::addToContainList( Object *rider )
 	{
 		m_stealthUnitsContained++;
 	}
+	if( rider->isKindOf( KINDOF_HERO ) )
+	{
+		m_heroUnitsContained++;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -664,6 +668,10 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 			}
 		}
 	}
+	if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )
+	{
+		m_heroUnitsContained--;
+	}
 
 
 	if (isEnclosingContainerFor( rider ))
@@ -753,11 +761,6 @@ void OpenContain::onContaining( Object *rider, Bool wasSelected )
 		enterSound.setObjectID(getObject()->getID());
 		TheAudio->addAudioEvent(&enterSound);
 	}
-
-	if( rider && rider->isKindOf( KINDOF_HERO ) )
-	{
-		m_heroUnitsContained++;
-	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -773,11 +776,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--;
-		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,10 @@ void OpenContain::addToContainList( Object *rider )`
`356`	`356`	`{`
`357`	`357`	`m_stealthUnitsContained++;`
`358`	`358`	`}`
	`359`	`+ if( rider->isKindOf( KINDOF_HERO ) )`
	`360`	`+ {`
	`361`	`+ m_heroUnitsContained++;`
	`362`	`+ }`
`359`	`363`	`}`
`360`	`364`
`361`	`365`	`//-------------------------------------------------------------------------------------------------`
`@@ -546,6 +550,10 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,`
`546`	`550`	`}`
`547`	`551`	`}`
`548`	`552`	`}`
	`553`	`+ if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
	`554`	`+ {`
	`555`	`+ m_heroUnitsContained--;`
	`556`	`+ }`
`549`	`557`
`550`	`558`
`551`	`559`	`if (isEnclosingContainerFor( rider ))`
`@@ -633,11 +641,6 @@ void OpenContain::onContaining( Object *rider )`
`633`	`641`	`enterSound.setObjectID(getObject()->getID());`
`634`	`642`	`TheAudio->addAudioEvent(&enterSound);`
`635`	`643`	`}`
`636`		`-`
`637`		`- if( rider && rider->isKindOf( KINDOF_HERO ) )`
`638`		`- {`
`639`		`- m_heroUnitsContained++;`
`640`		`- }`
`641`	`644`	`}`
`642`	`645`
`643`	`646`	`//-------------------------------------------------------------------------------------------------`
`@@ -653,11 +656,6 @@ void OpenContain::onRemoving( Object *rider)`
`653`	`656`	`AudioEventRTS fallingSound = *rider->getTemplate()->getSoundFalling();`
`654`	`657`	`fallingSound.setObjectID(rider->getID());`
`655`	`658`	`TheAudio->addAudioEvent(&fallingSound);`
`656`		`-`
`657`		`- if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
`658`		`- {`
`659`		`- m_heroUnitsContained--;`
`660`		`- }`
`661`	`659`	`}`
`662`	`660`	`}`
`663`	`661`
Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,10 @@ void OpenContain::addToContainList( Object *rider )`
`378`	`378`	`{`
`379`	`379`	`m_stealthUnitsContained++;`
`380`	`380`	`}`
	`381`	`+ if( rider->isKindOf( KINDOF_HERO ) )`
	`382`	`+ {`
	`383`	`+ m_heroUnitsContained++;`
	`384`	`+ }`
`381`	`385`	`}`
`382`	`386`
`383`	`387`	`//-------------------------------------------------------------------------------------------------`
`@@ -664,6 +668,10 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,`
`664`	`668`	`}`
`665`	`669`	`}`
`666`	`670`	`}`
	`671`	`+ if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
	`672`	`+ {`
	`673`	`+ m_heroUnitsContained--;`
	`674`	`+ }`
`667`	`675`
`668`	`676`
`669`	`677`	`if (isEnclosingContainerFor( rider ))`
`@@ -753,11 +761,6 @@ void OpenContain::onContaining( Object *rider, Bool wasSelected )`
`753`	`761`	`enterSound.setObjectID(getObject()->getID());`
`754`	`762`	`TheAudio->addAudioEvent(&enterSound);`
`755`	`763`	`}`
`756`		`-`
`757`		`- if( rider && rider->isKindOf( KINDOF_HERO ) )`
`758`		`- {`
`759`		`- m_heroUnitsContained++;`
`760`		`- }`
`761`	`764`	`}`
`762`	`765`
`763`	`766`	`//-------------------------------------------------------------------------------------------------`
`@@ -773,11 +776,6 @@ void OpenContain::onRemoving( Object *rider)`
`773`	`776`	`AudioEventRTS fallingSound = *rider->getTemplate()->getSoundFalling();`
`774`	`777`	`fallingSound.setObjectID(rider->getID());`
`775`	`778`	`TheAudio->addAudioEvent(&fallingSound);`
`776`		`-`
`777`		`- if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
`778`		`- {`
`779`		`- m_heroUnitsContained--;`
`780`		`- }`
`781`	`779`	`}`
`782`	`780`	`}`
`783`	`781`