build: wrap isHero optimization behind RETAIL_COMPATIBLE_CRC flag

bobtista · bobtista · commit bcbf169d03cd · 2025-11-12T22:59:56.000-05:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
@@ -164,7 +164,11 @@ class OpenContain : public UpdateModule,
 	virtual const Object *friend_getRider() const{return NULL;} ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 	virtual Real getContainedItemsMass() const;
 	virtual UnsignedInt getStealthUnitsContained() const { return m_stealthUnitsContained; }
+#if !RETAIL_COMPATIBLE_CRC
 	virtual UnsignedInt getHeroUnitsContained() const { return m_heroUnitsContained; }
+#else
+	virtual UnsignedInt getHeroUnitsContained() const { return 0; }
+#endif
 
 	virtual PlayerMaskType getPlayerWhoEntered(void) const { return m_playerEnteredMask; }
 
@@ -239,7 +243,9 @@ class OpenContain : public UpdateModule,
 
 	ObjectEnterExitMap	m_objectEnterExitInfo;
 	UnsignedInt					m_stealthUnitsContained;				///< number of stealth units that can't be seen by enemy players.
+#if !RETAIL_COMPATIBLE_CRC
 	UnsignedInt					m_heroUnitsContained;						///< cached hero count
+#endif
 	Int									m_whichExitPath; ///< Cycles from 1 to n and is used only in modules whose data has numberOfExitPaths > 1.
 	UnsignedInt					m_doorCloseCountdown;						///< When should I shut my door.
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
@@ -125,7 +125,9 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM
 	m_lastLoadSoundFrame = 0;
 	m_containListSize = 0;
 	m_stealthUnitsContained = 0;
+#if !RETAIL_COMPATIBLE_CRC
 	m_heroUnitsContained = 0;
+#endif
 	m_doorCloseCountdown = 0;
 
 	//Added By Sadullah Nader
@@ -635,10 +637,12 @@ void OpenContain::onContaining( Object *rider )
 	}
 
 	// TheSuperHackers @performance bobtista 13/11/2025 Cache hero count to avoid O(n) iteration in Object::isHero().
+#if !RETAIL_COMPATIBLE_CRC
 	if( rider && rider->isKindOf( KINDOF_HERO ) )
 	{
 		m_heroUnitsContained++;
 	}
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -655,10 +659,12 @@ void OpenContain::onRemoving( Object *rider)
 		fallingSound.setObjectID(rider->getID());
 		TheAudio->addAudioEvent(&fallingSound);
 
+#if !RETAIL_COMPATIBLE_CRC
 		if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )
 		{
 			m_heroUnitsContained--;
 		}
+#endif
 	}
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -595,17 +595,39 @@ Object::~Object()
 }
 
 //-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+#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/OpenContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
@@ -174,7 +174,11 @@ class OpenContain : public UpdateModule,
 	virtual const Object *friend_getRider() const{return NULL;} ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 	virtual Real getContainedItemsMass() const;
 	virtual UnsignedInt getStealthUnitsContained() const { return m_stealthUnitsContained; }
+#if !RETAIL_COMPATIBLE_CRC
 	virtual UnsignedInt getHeroUnitsContained() const { return m_heroUnitsContained; }
+#else
+	virtual UnsignedInt getHeroUnitsContained() const { return 0; }
+#endif
 
 	virtual PlayerMaskType getPlayerWhoEntered(void) const { return m_playerEnteredMask; }
 
@@ -260,7 +264,9 @@ class OpenContain : public UpdateModule,
 
 	ObjectEnterExitMap	m_objectEnterExitInfo;
 	UnsignedInt					m_stealthUnitsContained;				///< number of stealth units that can't be seen by enemy players.
+#if !RETAIL_COMPATIBLE_CRC
 	UnsignedInt					m_heroUnitsContained;						///< cached hero count
+#endif
 	Int									m_whichExitPath; ///< Cycles from 1 to n and is used only in modules whose data has numberOfExitPaths > 1.
 	UnsignedInt					m_doorCloseCountdown;						///< When should I shut my door.
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
@@ -129,7 +129,9 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM
 	m_lastLoadSoundFrame = 0;
 	m_containListSize = 0;
 	m_stealthUnitsContained = 0;
+#if !RETAIL_COMPATIBLE_CRC
 	m_heroUnitsContained = 0;
+#endif
 	m_doorCloseCountdown = 0;
 
 	//Added By Sadullah Nader
@@ -755,10 +757,12 @@ void OpenContain::onContaining( Object *rider, Bool wasSelected )
 	}
 
 	// TheSuperHackers @performance bobtista 13/11/2025 Cache hero count to avoid O(n) iteration in Object::isHero().
+#if !RETAIL_COMPATIBLE_CRC
 	if( rider && rider->isKindOf( KINDOF_HERO ) )
 	{
 		m_heroUnitsContained++;
 	}
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -775,10 +779,12 @@ void OpenContain::onRemoving( Object *rider)
 		fallingSound.setObjectID(rider->getID());
 		TheAudio->addAudioEvent(&fallingSound);
 
+#if !RETAIL_COMPATIBLE_CRC
 		if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )
 		{
 			m_heroUnitsContained--;
 		}
+#endif
 	}
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -2028,17 +2028,39 @@ 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
`@@ -125,7 +125,9 @@ OpenContain::OpenContain( Thing thing, const ModuleData moduleData ) : UpdateM`
`125`	`125`	`m_lastLoadSoundFrame = 0;`
`126`	`126`	`m_containListSize = 0;`
`127`	`127`	`m_stealthUnitsContained = 0;`
	`128`	`+#if !RETAIL_COMPATIBLE_CRC`
`128`	`129`	`m_heroUnitsContained = 0;`
	`130`	`+#endif`
`129`	`131`	`m_doorCloseCountdown = 0;`
`130`	`132`
`131`	`133`	`//Added By Sadullah Nader`
`@@ -635,10 +637,12 @@ void OpenContain::onContaining( Object *rider )`
`635`	`637`	`}`
`636`	`638`
`637`	`639`	`// TheSuperHackers @performance bobtista 13/11/2025 Cache hero count to avoid O(n) iteration in Object::isHero().`
	`640`	`+#if !RETAIL_COMPATIBLE_CRC`
`638`	`641`	`if( rider && rider->isKindOf( KINDOF_HERO ) )`
`639`	`642`	`{`
`640`	`643`	`m_heroUnitsContained++;`
`641`	`644`	`}`
	`645`	`+#endif`
`642`	`646`	`}`
`643`	`647`
`644`	`648`	`//-------------------------------------------------------------------------------------------------`
`@@ -655,10 +659,12 @@ void OpenContain::onRemoving( Object *rider)`
`655`	`659`	`fallingSound.setObjectID(rider->getID());`
`656`	`660`	`TheAudio->addAudioEvent(&fallingSound);`
`657`	`661`
	`662`	`+#if !RETAIL_COMPATIBLE_CRC`
`658`	`663`	`if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
`659`	`664`	`{`
`660`	`665`	`m_heroUnitsContained--;`
`661`	`666`	`}`
	`667`	`+#endif`
`662`	`668`	`}`
`663`	`669`	`}`
`664`	`670`
Original file line number	Diff line number	Diff line change
`@@ -595,17 +595,39 @@ Object::~Object()`
`595`	`595`	`}`
`596`	`596`
`597`	`597`	`//-------------------------------------------------------------------------------------------------`
	`598`	`+//-------------------------------------------------------------------------------------------------`
	`599`	`+#if RETAIL_COMPATIBLE_CRC`
	`600`	`+void localIsHero( Object obj, void userData )`
	`601`	`+{`
	`602`	`+ Bool hero = (Bool)userData;`
	`603`	`+`
	`604`	`+ if( obj && obj->isKindOf( KINDOF_HERO ) )`
	`605`	`+ {`
	`606`	`+ *hero = TRUE;`
	`607`	`+ }`
	`608`	`+}`
	`609`	`+#endif`
	`610`	`+`
`598`	`611`	`//-------------------------------------------------------------------------------------------------`
`599`	`612`	`// TheSuperHackers @performance bobtista 13/11/2025 Use cached hero count for O(1) lookup instead of O(n) iteration.`
`600`	`613`	`Bool Object::isHero() const`
`601`	`614`	`{`
`602`	`615`	`ContainModuleInterface *contain = getContain();`
`603`	`616`	`if( contain )`
`604`	`617`	`{`
	`618`	`+#if !RETAIL_COMPATIBLE_CRC`
`605`	`619`	`if( contain->getHeroUnitsContained() > 0 )`
`606`	`620`	`{`
`607`	`621`	`return TRUE;`
`608`	`622`	`}`
	`623`	`+#else`
	`624`	`+ Bool heroInside = FALSE;`
	`625`	`+ contain->iterateContained( localIsHero, (void*)(&heroInside), FALSE );`
	`626`	`+ if( heroInside )`
	`627`	`+ {`
	`628`	`+ return TRUE;`
	`629`	`+ }`
	`630`	`+#endif`
`609`	`631`	`}`
`610`	`632`	`return isKindOf( KINDOF_HERO );`
`611`	`633`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,9 @@ OpenContain::OpenContain( Thing thing, const ModuleData moduleData ) : UpdateM`
`129`	`129`	`m_lastLoadSoundFrame = 0;`
`130`	`130`	`m_containListSize = 0;`
`131`	`131`	`m_stealthUnitsContained = 0;`
	`132`	`+#if !RETAIL_COMPATIBLE_CRC`
`132`	`133`	`m_heroUnitsContained = 0;`
	`134`	`+#endif`
`133`	`135`	`m_doorCloseCountdown = 0;`
`134`	`136`
`135`	`137`	`//Added By Sadullah Nader`
`@@ -755,10 +757,12 @@ void OpenContain::onContaining( Object *rider, Bool wasSelected )`
`755`	`757`	`}`
`756`	`758`
`757`	`759`	`// TheSuperHackers @performance bobtista 13/11/2025 Cache hero count to avoid O(n) iteration in Object::isHero().`
	`760`	`+#if !RETAIL_COMPATIBLE_CRC`
`758`	`761`	`if( rider && rider->isKindOf( KINDOF_HERO ) )`
`759`	`762`	`{`
`760`	`763`	`m_heroUnitsContained++;`
`761`	`764`	`}`
	`765`	`+#endif`
`762`	`766`	`}`
`763`	`767`
`764`	`768`	`//-------------------------------------------------------------------------------------------------`
`@@ -775,10 +779,12 @@ void OpenContain::onRemoving( Object *rider)`
`775`	`779`	`fallingSound.setObjectID(rider->getID());`
`776`	`780`	`TheAudio->addAudioEvent(&fallingSound);`
`777`	`781`
	`782`	`+#if !RETAIL_COMPATIBLE_CRC`
`778`	`783`	`if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 )`
`779`	`784`	`{`
`780`	`785`	`m_heroUnitsContained--;`
`781`	`786`	`}`
	`787`	`+#endif`
`782`	`788`	`}`
`783`	`789`	`}`
`784`	`790`
Original file line number	Diff line number	Diff line change
`@@ -2028,17 +2028,39 @@ Bool Object::isNonFactionStructure(void) const`
`2028`	`2028`	`return isStructure() && !isFactionStructure();`
`2029`	`2029`	`}`
`2030`	`2030`
	`2031`	`+//-------------------------------------------------------------------------------------------------`
	`2032`	`+#if RETAIL_COMPATIBLE_CRC`
	`2033`	`+void localIsHero( Object obj, void userData )`
	`2034`	`+{`
	`2035`	`+ Bool hero = (Bool)userData;`
	`2036`	`+`
	`2037`	`+ if( obj && obj->isKindOf( KINDOF_HERO ) )`
	`2038`	`+ {`
	`2039`	`+ *hero = TRUE;`
	`2040`	`+ }`
	`2041`	`+}`
	`2042`	`+#endif`
	`2043`	`+`
`2031`	`2044`	`//-------------------------------------------------------------------------------------------------`
`2032`	`2045`	`// TheSuperHackers @performance bobtista 13/11/2025 Use cached hero count for O(1) lookup instead of O(n) iteration.`
`2033`	`2046`	`Bool Object::isHero(void) const`
`2034`	`2047`	`{`
`2035`	`2048`	`ContainModuleInterface *contain = getContain();`
`2036`	`2049`	`if( contain )`
`2037`	`2050`	`{`
	`2051`	`+#if !RETAIL_COMPATIBLE_CRC`
`2038`	`2052`	`if( contain->getHeroUnitsContained() > 0 )`
`2039`	`2053`	`{`
`2040`	`2054`	`return TRUE;`
`2041`	`2055`	`}`
	`2056`	`+#else`
	`2057`	`+ Bool heroInside = FALSE;`
	`2058`	`+ contain->iterateContained( localIsHero, (void*)(&heroInside), FALSE );`
	`2059`	`+ if( heroInside )`
	`2060`	`+ {`
	`2061`	`+ return TRUE;`
	`2062`	`+ }`
	`2063`	`+#endif`
`2042`	`2064`	`}`
`2043`	`2065`	`return isKindOf( KINDOF_HERO );`
`2044`	`2066`	`}`