perf: Remove superfluous null tests in iterateObjects callbacks (TheSuperHackers#2658)

xezon · web-flow · commit af4f950ce4f2 · 2026-04-28T19:29:46.000+02:00
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp
@@ -1154,9 +1154,6 @@ struct PlayerObjectFindInfo
 //-------------------------------------------------------------------------------------------------
 static void doFindCommandCenter(Object* obj, void* userData)
 {
-	if (!obj)
-		return;
-
 	PlayerObjectFindInfo* info = (PlayerObjectFindInfo*)userData;
 
 	if (info->obj == nullptr
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
@@ -71,10 +71,6 @@ struct SelectObjectsInfo
 static void selectObjectOfType( Object* obj, void* selectObjectsInfo )
 {
 	SelectObjectsInfo *soInfo = (SelectObjectsInfo*)selectObjectsInfo;
-	if( !obj || !soInfo )
-	{
-		return;
-	}
 
 	//Do the templates match?
 	if( obj->getTemplate()->isEquivalentTo( soInfo->thingTemplate ) )
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -98,8 +98,6 @@
 void countObjects(Object *obj, void *userData)
 {
 	Int *numObjects = (Int *)userData;
-	if (!numObjects || !obj)
-		return;
 
 	DEBUG_LOG(("Looking at obj %d (%s) - isEffectivelyDead()==%d, isDestroyed==%d, numObjects==%d",
 		obj->getID(), obj->getTemplate()->getName().str(), obj->isEffectivelyDead(), obj->isDestroyed(), *numObjects));
@@ -110,9 +108,6 @@ void countObjects(Object *obj, void *userData)
 
 void printObjects(Object *obj, void *userData)
 {
-	if (!obj)
-		return;
-
 	Bool isDead = obj->isEffectivelyDead() || obj->isDestroyed();
 	Bool isInert = obj->isKindOf(KINDOF_INERT);
 	AsciiString statusStr = (isDead)?"Dead":(isInert)?"Inert":"Living";
@@ -858,10 +853,6 @@ struct CommandCenterLocator
 
 void findCommandCenterOrMostExpensiveBuilding(Object* obj, void* vccl)
 {
-	if (!obj) {
-		return;
-	}
-
 	CommandCenterLocator *ccl = (CommandCenterLocator*) vccl;
 
 	// here's the deal. We want to get the first Command Center in the list.
@@ -911,9 +902,7 @@ struct HeroHolder
 
 void amIAHero(Object* obj, void* heroHolder)
 {
-
-
-	if (!obj || ((HeroHolder*)heroHolder)->hero != nullptr)
+	if (((HeroHolder*)heroHolder)->hero != nullptr)
 	{
 		return;
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp
@@ -648,7 +648,7 @@ void findDrone( Object *obj, void *droneInfo )
 {
 	DroneInfo *dInfo = (DroneInfo*)droneInfo;
 
-	if( !dInfo->found && obj )
+	if( !dInfo->found )
 	{
 		if( obj->isKindOf( KINDOF_DRONE ) && obj->getProducerID() == dInfo->owner->getID() )
 		{
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -92,20 +92,17 @@ extern void oversizeTheTerrain(Int amount);
 // or the indicator color. this allows us to force the situation. (srj)
 static void updateTeamAndPlayerStuff( Object *obj, void *userData )
 {
-	if (obj)
-	{
-		obj->updateUpgradeModules();
+	obj->updateUpgradeModules();
 
-		// srj sez: apparently we have to do this too, since Team::setControllingPlayer
-		// does not. Might make more sense to do it there, but am scared to at this point.
-		Drawable* draw = obj->getDrawable();
-		if (draw)
-		{
-			if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
-				draw->setIndicatorColor(obj->getNightIndicatorColor());
-			else
-				draw->setIndicatorColor(obj->getIndicatorColor());
-		}
+	// srj sez: apparently we have to do this too, since Team::setControllingPlayer
+	// does not. Might make more sense to do it there, but am scared to at this point.
+	Drawable* draw = obj->getDrawable();
+	if (draw)
+	{
+		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
+			draw->setIndicatorColor(obj->getNightIndicatorColor());
+		else
+			draw->setIndicatorColor(obj->getIndicatorColor());
 	}
 }
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
@@ -2137,7 +2137,7 @@ void GameLogic::tryStartNewGame( Bool loadingSaveGame )
 //-----------------------------------------------------------------------------------------
 static void findAndSelectCommandCenter(Object *obj, void* alreadyFound)
 {
-	if (!((*(Bool*)alreadyFound)) && obj && obj->isKindOf(KINDOF_COMMANDCENTER) )
+	if (!((*(Bool*)alreadyFound)) && obj->isKindOf(KINDOF_COMMANDCENTER) )
 	{
 		((*(Bool*)alreadyFound)) = TRUE;
 		TheGameLogic->selectObject(obj, TRUE, obj->getControllingPlayer()->getPlayerMask(), obj->isLocallyControlled());
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp
@@ -88,7 +88,7 @@ void findDozerCommandSet( Object *object, void *userData )
 	{
 		return;
 	}
-	if( object && object->isKindOf( KINDOF_DOZER ) )
+	if( object->isKindOf( KINDOF_DOZER ) )
 	{
 		dozerCommandSet = TheControlBar->findCommandSet( object->getCommandSetString() );
 	}
@@ -284,10 +284,6 @@ void AcademyStats::init( const Player *player )
 static void updateAcademyStats( Object *obj, void *userData )
 {
 	AcademyStats *academy = (AcademyStats*)userData;
-	if( !obj || !academy )
-	{
-		return;
-	}
 
 	if( academy->isFirstUpdate() )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
@@ -1204,9 +1204,6 @@ struct PlayerObjectFindInfo
 //-------------------------------------------------------------------------------------------------
 static void doFindCommandCenter(Object* obj, void* userData)
 {
-	if (!obj)
-		return;
-
 	PlayerObjectFindInfo* info = (PlayerObjectFindInfo*)userData;
 
 	if (info->obj == nullptr
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
@@ -71,10 +71,6 @@ struct SelectObjectsInfo
 static void selectObjectOfType( Object* obj, void* selectObjectsInfo )
 {
 	SelectObjectsInfo *soInfo = (SelectObjectsInfo*)selectObjectsInfo;
-	if( !obj || !soInfo )
-	{
-		return;
-	}
 
 	//Do the templates match?
 	if( obj->getTemplate()->isEquivalentTo( soInfo->thingTemplate ) )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -97,8 +97,6 @@
 void countObjects(Object *obj, void *userData)
 {
 	Int *numObjects = (Int *)userData;
-	if (!numObjects || !obj)
-		return;
 
 	DEBUG_LOG(("Looking at obj %d (%s) - isEffectivelyDead()==%d, isDestroyed==%d, numObjects==%d",
 		obj->getID(), obj->getTemplate()->getName().str(), obj->isEffectivelyDead(), obj->isDestroyed(), *numObjects));
@@ -109,9 +107,6 @@ void countObjects(Object *obj, void *userData)
 
 void printObjects(Object *obj, void *userData)
 {
-	if (!obj)
-		return;
-
 	Bool isDead = obj->isEffectivelyDead() || obj->isDestroyed();
 	Bool isInert = obj->isKindOf(KINDOF_INERT);
 	AsciiString statusStr = (isDead)?"Dead":(isInert)?"Inert":"Living";
@@ -912,10 +907,6 @@ struct CommandCenterLocator
 
 void findCommandCenterOrMostExpensiveBuilding(Object* obj, void* vccl)
 {
-	if (!obj) {
-		return;
-	}
-
 	CommandCenterLocator *ccl = (CommandCenterLocator*) vccl;
 
 	// here's the deal. We want to get the first Command Center in the list.
@@ -965,9 +956,7 @@ struct HeroHolder
 
 void amIAHero(Object* obj, void* heroHolder)
 {
-
-
-	if (!obj || ((HeroHolder*)heroHolder)->hero != nullptr)
+	if (((HeroHolder*)heroHolder)->hero != nullptr)
 	{
 		return;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp
@@ -648,7 +648,7 @@ void findDrone( Object *obj, void *droneInfo )
 {
 	DroneInfo *dInfo = (DroneInfo*)droneInfo;
 
-	if( !dInfo->found && obj )
+	if( !dInfo->found )
 	{
 		if( obj->isKindOf( KINDOF_DRONE ) && obj->getProducerID() == dInfo->owner->getID() )
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -96,20 +96,17 @@ extern void oversizeTheTerrain(Int amount);
 // or the indicator color. this allows us to force the situation. (srj)
 static void updateTeamAndPlayerStuff( Object *obj, void *userData )
 {
-	if (obj)
-	{
-		obj->updateUpgradeModules();
+	obj->updateUpgradeModules();
 
-		// srj sez: apparently we have to do this too, since Team::setControllingPlayer
-		// does not. Might make more sense to do it there, but am scared to at this point.
-		Drawable* draw = obj->getDrawable();
-		if (draw)
-		{
-			if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
-				draw->setIndicatorColor(obj->getNightIndicatorColor());
-			else
-				draw->setIndicatorColor(obj->getIndicatorColor());
-		}
+	// srj sez: apparently we have to do this too, since Team::setControllingPlayer
+	// does not. Might make more sense to do it there, but am scared to at this point.
+	Drawable* draw = obj->getDrawable();
+	if (draw)
+	{
+		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
+			draw->setIndicatorColor(obj->getNightIndicatorColor());
+		else
+			draw->setIndicatorColor(obj->getIndicatorColor());
 	}
 }
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
@@ -2452,7 +2452,7 @@ void GameLogic::createOptimizedTree(const ThingTemplate *thingTemplate, Coord3D
 //-----------------------------------------------------------------------------------------
 static void findAndSelectCommandCenter(Object *obj, void* alreadyFound)
 {
-	if (!((*(Bool*)alreadyFound)) && obj && obj->isKindOf(KINDOF_COMMANDCENTER) )
+	if (!((*(Bool*)alreadyFound)) && obj->isKindOf(KINDOF_COMMANDCENTER) )
 	{
 		((*(Bool*)alreadyFound)) = TRUE;
 		TheGameLogic->selectObject(obj, TRUE, obj->getControllingPlayer()->getPlayerMask(), obj->isLocallyControlled());

Original file line number	Diff line number	Diff line change
`@@ -1154,9 +1154,6 @@ struct PlayerObjectFindInfo`
`1154`	`1154`	`//-------------------------------------------------------------------------------------------------`
`1155`	`1155`	`static void doFindCommandCenter(Object* obj, void* userData)`
`1156`	`1156`	`{`
`1157`		`- if (!obj)`
`1158`		`- return;`
`1159`		`-`
`1160`	`1157`	`PlayerObjectFindInfo* info = (PlayerObjectFindInfo*)userData;`
`1161`	`1158`
`1162`	`1159`	`if (info->obj == nullptr`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,6 @@`
`98`	`98`	`void countObjects(Object obj, void userData)`
`99`	`99`	`{`
`100`	`100`	`Int numObjects = (Int )userData;`
`101`		`- if (!numObjects \|\| !obj)`
`102`		`- return;`
`103`	`101`
`104`	`102`	`DEBUG_LOG(("Looking at obj %d (%s) - isEffectivelyDead()==%d, isDestroyed==%d, numObjects==%d",`
`105`	`103`	`obj->getID(), obj->getTemplate()->getName().str(), obj->isEffectivelyDead(), obj->isDestroyed(), *numObjects));`
`@@ -110,9 +108,6 @@ void countObjects(Object obj, void userData)`
`110`	`108`
`111`	`109`	`void printObjects(Object obj, void userData)`
`112`	`110`	`{`
`113`		`- if (!obj)`
`114`		`- return;`
`115`		`-`
`116`	`111`	`Bool isDead = obj->isEffectivelyDead() \|\| obj->isDestroyed();`
`117`	`112`	`Bool isInert = obj->isKindOf(KINDOF_INERT);`
`118`	`113`	`AsciiString statusStr = (isDead)?"Dead":(isInert)?"Inert":"Living";`
`@@ -858,10 +853,6 @@ struct CommandCenterLocator`
`858`	`853`
`859`	`854`	`void findCommandCenterOrMostExpensiveBuilding(Object* obj, void* vccl)`
`860`	`855`	`{`
`861`		`- if (!obj) {`
`862`		`- return;`
`863`		`- }`
`864`		`-`
`865`	`856`	`CommandCenterLocator ccl = (CommandCenterLocator) vccl;`
`866`	`857`
`867`	`858`	`// here's the deal. We want to get the first Command Center in the list.`
`@@ -911,9 +902,7 @@ struct HeroHolder`
`911`	`902`
`912`	`903`	`void amIAHero(Object* obj, void* heroHolder)`
`913`	`904`	`{`
`914`		`-`
`915`		`-`
`916`		`- if (!obj \|\| ((HeroHolder*)heroHolder)->hero != nullptr)`
	`905`	`+ if (((HeroHolder*)heroHolder)->hero != nullptr)`
`917`	`906`	`{`
`918`	`907`	`return;`
`919`	`908`	`}`
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ void findDrone( Object obj, void droneInfo )`
`648`	`648`	`{`
`649`	`649`	`DroneInfo dInfo = (DroneInfo)droneInfo;`
`650`	`650`
`651`		`- if( !dInfo->found && obj )`
	`651`	`+ if( !dInfo->found )`
`652`	`652`	`{`
`653`	`653`	`if( obj->isKindOf( KINDOF_DRONE ) && obj->getProducerID() == dInfo->owner->getID() )`
`654`	`654`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2137,7 +2137,7 @@ void GameLogic::tryStartNewGame( Bool loadingSaveGame )`
`2137`	`2137`	`//-----------------------------------------------------------------------------------------`
`2138`	`2138`	`static void findAndSelectCommandCenter(Object obj, void alreadyFound)`
`2139`	`2139`	`{`
`2140`		`- if (!(((Bool)alreadyFound)) && obj && obj->isKindOf(KINDOF_COMMANDCENTER) )`
	`2140`	`+ if (!(((Bool)alreadyFound)) && obj->isKindOf(KINDOF_COMMANDCENTER) )`
`2141`	`2141`	`{`
`2142`	`2142`	`(((Bool)alreadyFound)) = TRUE;`
`2143`	`2143`	`TheGameLogic->selectObject(obj, TRUE, obj->getControllingPlayer()->getPlayerMask(), obj->isLocallyControlled());`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void findDozerCommandSet( Object object, void userData )`
`88`	`88`	`{`
`89`	`89`	`return;`
`90`	`90`	`}`
`91`		`- if( object && object->isKindOf( KINDOF_DOZER ) )`
	`91`	`+ if( object->isKindOf( KINDOF_DOZER ) )`
`92`	`92`	`{`
`93`	`93`	`dozerCommandSet = TheControlBar->findCommandSet( object->getCommandSetString() );`
`94`	`94`	`}`
`@@ -284,10 +284,6 @@ void AcademyStats::init( const Player *player )`
`284`	`284`	`static void updateAcademyStats( Object obj, void userData )`
`285`	`285`	`{`
`286`	`286`	`AcademyStats academy = (AcademyStats)userData;`
`287`		`- if( !obj \|\| !academy )`
`288`		`- {`
`289`		`- return;`
`290`		`- }`
`291`	`287`
`292`	`288`	`if( academy->isFirstUpdate() )`
`293`	`289`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1204,9 +1204,6 @@ struct PlayerObjectFindInfo`
`1204`	`1204`	`//-------------------------------------------------------------------------------------------------`
`1205`	`1205`	`static void doFindCommandCenter(Object* obj, void* userData)`
`1206`	`1206`	`{`
`1207`		`- if (!obj)`
`1208`		`- return;`
`1209`		`-`
`1210`	`1207`	`PlayerObjectFindInfo* info = (PlayerObjectFindInfo*)userData;`
`1211`	`1208`
`1212`	`1209`	`if (info->obj == nullptr`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,6 @@`
`97`	`97`	`void countObjects(Object obj, void userData)`
`98`	`98`	`{`
`99`	`99`	`Int numObjects = (Int )userData;`
`100`		`- if (!numObjects \|\| !obj)`
`101`		`- return;`
`102`	`100`
`103`	`101`	`DEBUG_LOG(("Looking at obj %d (%s) - isEffectivelyDead()==%d, isDestroyed==%d, numObjects==%d",`
`104`	`102`	`obj->getID(), obj->getTemplate()->getName().str(), obj->isEffectivelyDead(), obj->isDestroyed(), *numObjects));`
`@@ -109,9 +107,6 @@ void countObjects(Object obj, void userData)`
`109`	`107`
`110`	`108`	`void printObjects(Object obj, void userData)`
`111`	`109`	`{`
`112`		`- if (!obj)`
`113`		`- return;`
`114`		`-`
`115`	`110`	`Bool isDead = obj->isEffectivelyDead() \|\| obj->isDestroyed();`
`116`	`111`	`Bool isInert = obj->isKindOf(KINDOF_INERT);`
`117`	`112`	`AsciiString statusStr = (isDead)?"Dead":(isInert)?"Inert":"Living";`
`@@ -912,10 +907,6 @@ struct CommandCenterLocator`
`912`	`907`
`913`	`908`	`void findCommandCenterOrMostExpensiveBuilding(Object* obj, void* vccl)`
`914`	`909`	`{`
`915`		`- if (!obj) {`
`916`		`- return;`
`917`		`- }`
`918`		`-`
`919`	`910`	`CommandCenterLocator ccl = (CommandCenterLocator) vccl;`
`920`	`911`
`921`	`912`	`// here's the deal. We want to get the first Command Center in the list.`
`@@ -965,9 +956,7 @@ struct HeroHolder`
`965`	`956`
`966`	`957`	`void amIAHero(Object* obj, void* heroHolder)`
`967`	`958`	`{`
`968`		`-`
`969`		`-`
`970`		`- if (!obj \|\| ((HeroHolder*)heroHolder)->hero != nullptr)`
	`959`	`+ if (((HeroHolder*)heroHolder)->hero != nullptr)`
`971`	`960`	`{`
`972`	`961`	`return;`
`973`	`962`	`}`