bugfix(aiplayer): Improve initialization of uninitialized variable in AIPlayer::onUnitProduced

Generals/Code/GameEngine/Include/GameLogic/GameLogic.h

@@ -479,6 +479,11 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void xferObjectTOC( Xfer *xfer );												///< save/load object TOC for current state of map
 	void prepareLogicForObjectLoad();									///< prepare engine for object data from game file
 
+#if RTS_GENERALS && defined(_MSC_VER) && _MSC_VER < 1300
+public:
+	Bool m_onUnitProducedZeroInit;
+#endif
+
 };
 
 // INLINE /////////////////////////////////////////////////////////////////////////////////////////

Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp

@@ -1051,6 +1051,16 @@ void AIPlayer::onUnitProduced( Object *factory, Object *unit )
 	// To keep retail compatibility it needs to be set true in VS6 builds.
 #if defined(_MSC_VER) && _MSC_VER < 1300
 	Bool supplyTruck = true;
+
+#if RTS_GENERALS
+	// A special initialization case for the call site in SpawnBehavior::createSpawn
+	// to mimic the initialization behavior in the retail Generals binary.
+	if (TheGameLogic->m_onUnitProducedZeroInit)
+	{
+		supplyTruck = false;
+	}
+#endif
+
 #else
 	Bool supplyTruck = false;
 #endif

Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp

@@ -585,7 +585,14 @@ Bool SpawnBehavior::createSpawn()
 		newSpawn = TheThingFactory->newObject( m_spawnTemplate, parent->getTeam() ); // just a little worried about this...
 
 		// Count this unit towards our score.
+#if RTS_GENERALS && defined(_MSC_VER) && _MSC_VER < 1300
+		// TheSuperHackers @info Set m_onUnitProducedZeroInit to true so it can be used in AIPlayer::onUnitProduced.
+		TheGameLogic->m_onUnitProducedZeroInit = true;
 		newSpawn->getControllingPlayer()->onUnitCreated(parent, newSpawn);
+		TheGameLogic->m_onUnitProducedZeroInit = false;
+#else
+		newSpawn->getControllingPlayer()->onUnitCreated(parent, newSpawn);
+#endif
 
 		// Gee, this is new...
 		// Now, we can have a list of template names.

Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -278,6 +278,10 @@ GameLogic::GameLogic()
 	m_loadingMap = FALSE;
 	m_loadingSave = FALSE;
 	m_clearingGameData = FALSE;
+
+#if RTS_GENERALS && defined(_MSC_VER) && _MSC_VER < 1300
+	m_onUnitProducedZeroInit = false;
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h

@@ -488,6 +488,11 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void xferObjectTOC( Xfer *xfer );												///< save/load object TOC for current state of map
 	void prepareLogicForObjectLoad();									///< prepare engine for object data from game file
 
+#if RTS_GENERALS && defined(_MSC_VER) && _MSC_VER < 1300
+public:
+	Bool m_onUnitProducedZeroInit;
+#endif
+
 };
 
 // INLINE /////////////////////////////////////////////////////////////////////////////////////////

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp

@@ -1058,6 +1058,16 @@ void AIPlayer::onUnitProduced( Object *factory, Object *unit )
 	// To keep retail compatibility it needs to be set true in VS6 builds.
 #if defined(_MSC_VER) && _MSC_VER < 1300
 	Bool supplyTruck = true;
+
+#if RTS_GENERALS
+	// A special initialization case for the call site in SpawnBehavior::createSpawn
+	// to mimic the initialization behavior in the retail Generals binary.
+	if (TheGameLogic->m_onUnitProducedZeroInit)
+	{
+		supplyTruck = false;
+	}
+#endif
+
 #else
 	Bool supplyTruck = false;
 #endif

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp

@@ -629,7 +629,14 @@ Bool SpawnBehavior::createSpawn()
 		newSpawn = TheThingFactory->newObject( m_spawnTemplate, parent->getTeam() ); // just a little worried about this...
 
 		// Count this unit towards our score.
+#if RTS_GENERALS && defined(_MSC_VER) && _MSC_VER < 1300
+		// TheSuperHackers @info Set m_onUnitProducedZeroInit to true so it can be used in AIPlayer::onUnitProduced.
+		TheGameLogic->m_onUnitProducedZeroInit = true;
 		newSpawn->getControllingPlayer()->onUnitCreated(parent, newSpawn);
+		TheGameLogic->m_onUnitProducedZeroInit = false;
+#else
+		newSpawn->getControllingPlayer()->onUnitCreated(parent, newSpawn);
+#endif
 
 		// Gee, this is new...
 		// Now, we can have a list of template names.

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -289,6 +289,10 @@ GameLogic::GameLogic()
 	m_loadingSave = FALSE;
 	m_clearingGameData = FALSE;
 	m_quitToDesktopAfterMatch = FALSE;
+
+#if RTS_GENERALS && defined(_MSC_VER) && _MSC_VER < 1300
+	m_onUnitProducedZeroInit = false;
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------