build(ai): Resolve compile errors when the USE_DOZER preprocessor directive is false (#1871)

Stubbjax · web-flow · commit 393416491dbd · 2025-11-17T19:18:21.000+01:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
@@ -801,6 +801,7 @@ void AIPlayer::processBaseBuilding( void )
 
 #else
 					// force delay between rebuilds
+					Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);
 					if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)
 					{
 						m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);
@@ -815,7 +816,7 @@ void AIPlayer::processBaseBuilding( void )
 							m_player->getMoney()->withdraw( cost );
 
 							// inst-construct the building
-							bldg = buildStructureNow(bldgPlan, info, NULL);
+							bldg = buildStructureNow(bldgPlan, info);
 							// store the object with the build order
 							if (bldg)
 							{
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
@@ -262,6 +262,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 
 #else
 			// force delay between rebuilds
+			Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);
 			if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)
 			{
 				m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);
@@ -276,12 +277,12 @@ void AISkirmishPlayer::processBaseBuilding( void )
 					m_player->getMoney()->withdraw( cost );
 
 					// inst-construct the building
-					bldg = buildStructureNow(bldgPlan, info, NULL);
+					bldg = buildStructureNow(bldgPlan, bldgInfo);
 					// store the object with the build order
 					if (bldg)
 					{
-						info->setObjectID( bldg->getID() );
-						info->decrementNumRebuilds();
+						bldgInfo->setObjectID( bldg->getID() );
+						bldgInfo->decrementNumRebuilds();
 
 						m_readyToBuildStructure = false;
 						m_structureTimer = TheAI->getAiData()->m_structureSeconds*LOGICFRAMES_PER_SECOND;
@@ -291,8 +292,6 @@ void AISkirmishPlayer::processBaseBuilding( void )
 							m_structureTimer = m_structureTimer/TheAI->getAiData()->m_structuresWealthyMod;
 						}
 						m_frameLastBuildingBuilt = TheGameLogic->getFrame();
-						// only build one building per delay loop
-						break;
 					}
 				}
 			}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
@@ -808,6 +808,7 @@ void AIPlayer::processBaseBuilding( void )
 
 #else
 					// force delay between rebuilds
+					Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);
 					if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)
 					{
 						m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);
@@ -822,7 +823,7 @@ void AIPlayer::processBaseBuilding( void )
 							m_player->getMoney()->withdraw( cost );
 
 							// inst-construct the building
-							bldg = buildStructureNow(bldgPlan, info, NULL);
+							bldg = buildStructureNow(bldgPlan, info);
 							// store the object with the build order
 							if (bldg)
 							{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
@@ -269,6 +269,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 
 #else
 			// force delay between rebuilds
+			Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);
 			if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)
 			{
 				m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);
@@ -283,12 +284,12 @@ void AISkirmishPlayer::processBaseBuilding( void )
 					m_player->getMoney()->withdraw( cost );
 
 					// inst-construct the building
-					bldg = buildStructureNow(bldgPlan, info, NULL);
+					bldg = buildStructureNow(bldgPlan, bldgInfo);
 					// store the object with the build order
 					if (bldg)
 					{
-						info->setObjectID( bldg->getID() );
-						info->decrementNumRebuilds();
+						bldgInfo->setObjectID( bldg->getID() );
+						bldgInfo->decrementNumRebuilds();
 
 						m_readyToBuildStructure = false;
 						m_structureTimer = TheAI->getAiData()->m_structureSeconds*LOGICFRAMES_PER_SECOND;
@@ -298,8 +299,6 @@ void AISkirmishPlayer::processBaseBuilding( void )
 							m_structureTimer = m_structureTimer/TheAI->getAiData()->m_structuresWealthyMod;
 						}
 						m_frameLastBuildingBuilt = TheGameLogic->getFrame();
-						// only build one building per delay loop
-						break;
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -801,6 +801,7 @@ void AIPlayer::processBaseBuilding( void )`
`801`	`801`
`802`	`802`	`#else`
`803`	`803`	`// force delay between rebuilds`
	`804`	`+ Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);`
`804`	`805`	`if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)`
`805`	`806`	`{`
`806`	`807`	`m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);`
`@@ -815,7 +816,7 @@ void AIPlayer::processBaseBuilding( void )`
`815`	`816`	`m_player->getMoney()->withdraw( cost );`
`816`	`817`
`817`	`818`	`// inst-construct the building`
`818`		`- bldg = buildStructureNow(bldgPlan, info, NULL);`
	`819`	`+ bldg = buildStructureNow(bldgPlan, info);`
`819`	`820`	`// store the object with the build order`
`820`	`821`	`if (bldg)`
`821`	`822`	`{`
Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ void AISkirmishPlayer::processBaseBuilding( void )`
`262`	`262`
`263`	`263`	`#else`
`264`	`264`	`// force delay between rebuilds`
	`265`	`+ Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);`
`265`	`266`	`if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)`
`266`	`267`	`{`
`267`	`268`	`m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);`
`@@ -276,12 +277,12 @@ void AISkirmishPlayer::processBaseBuilding( void )`
`276`	`277`	`m_player->getMoney()->withdraw( cost );`
`277`	`278`
`278`	`279`	`// inst-construct the building`
`279`		`- bldg = buildStructureNow(bldgPlan, info, NULL);`
	`280`	`+ bldg = buildStructureNow(bldgPlan, bldgInfo);`
`280`	`281`	`// store the object with the build order`
`281`	`282`	`if (bldg)`
`282`	`283`	`{`
`283`		`- info->setObjectID( bldg->getID() );`
`284`		`- info->decrementNumRebuilds();`
	`284`	`+ bldgInfo->setObjectID( bldg->getID() );`
	`285`	`+ bldgInfo->decrementNumRebuilds();`
`285`	`286`
`286`	`287`	`m_readyToBuildStructure = false;`
`287`	`288`	`m_structureTimer = TheAI->getAiData()->m_structureSeconds*LOGICFRAMES_PER_SECOND;`
`@@ -291,8 +292,6 @@ void AISkirmishPlayer::processBaseBuilding( void )`
`291`	`292`	`m_structureTimer = m_structureTimer/TheAI->getAiData()->m_structuresWealthyMod;`
`292`	`293`	`}`
`293`	`294`	`m_frameLastBuildingBuilt = TheGameLogic->getFrame();`
`294`		`- // only build one building per delay loop`
`295`		`- break;`
`296`	`295`	`}`
`297`	`296`	`}`
`298`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,7 @@ void AIPlayer::processBaseBuilding( void )`
`808`	`808`
`809`	`809`	`#else`
`810`	`810`	`// force delay between rebuilds`
	`811`	`+ Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);`
`811`	`812`	`if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)`
`812`	`813`	`{`
`813`	`814`	`m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);`
`@@ -822,7 +823,7 @@ void AIPlayer::processBaseBuilding( void )`
`822`	`823`	`m_player->getMoney()->withdraw( cost );`
`823`	`824`
`824`	`825`	`// inst-construct the building`
`825`		`- bldg = buildStructureNow(bldgPlan, info, NULL);`
	`826`	`+ bldg = buildStructureNow(bldgPlan, info);`
`826`	`827`	`// store the object with the build order`
`827`	`828`	`if (bldg)`
`828`	`829`	`{`
Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ void AISkirmishPlayer::processBaseBuilding( void )`
`269`	`269`
`270`	`270`	`#else`
`271`	`271`	`// force delay between rebuilds`
	`272`	`+ Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);`
`272`	`273`	`if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)`
`273`	`274`	`{`
`274`	`275`	`m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);`
`@@ -283,12 +284,12 @@ void AISkirmishPlayer::processBaseBuilding( void )`
`283`	`284`	`m_player->getMoney()->withdraw( cost );`
`284`	`285`
`285`	`286`	`// inst-construct the building`
`286`		`- bldg = buildStructureNow(bldgPlan, info, NULL);`
	`287`	`+ bldg = buildStructureNow(bldgPlan, bldgInfo);`
`287`	`288`	`// store the object with the build order`
`288`	`289`	`if (bldg)`
`289`	`290`	`{`
`290`		`- info->setObjectID( bldg->getID() );`
`291`		`- info->decrementNumRebuilds();`
	`291`	`+ bldgInfo->setObjectID( bldg->getID() );`
	`292`	`+ bldgInfo->decrementNumRebuilds();`
`292`	`293`
`293`	`294`	`m_readyToBuildStructure = false;`
`294`	`295`	`m_structureTimer = TheAI->getAiData()->m_structureSeconds*LOGICFRAMES_PER_SECOND;`
`@@ -298,8 +299,6 @@ void AISkirmishPlayer::processBaseBuilding( void )`
`298`	`299`	`m_structureTimer = m_structureTimer/TheAI->getAiData()->m_structuresWealthyMod;`
`299`	`300`	`}`
`300`	`301`	`m_frameLastBuildingBuilt = TheGameLogic->getFrame();`
`301`		`- // only build one building per delay loop`
`302`		`- break;`
`303`	`302`	`}`
`304`	`303`	`}`
`305`	`304`	`}`