[Minor] Supplementary Convert.ResetMindControl (#1704)

Author: Fly-Star-him

CREDITS.md

@@ -367,6 +367,7 @@ This page lists all the individual contributions to the project by their author.
   - `600 The shield of the attached object is broken` bug fix for the triggered event
   - Fixed an issue where a portion of Ares's trigger event 75/77 was determined unsuccessfully
   - Second weapon with `ElectricAssault=yes` will not unconditionally attack your building with `Overpowerable=yes`
+  - Fixed some units of Ares crashing after deployment conversion
 - **NetsuNegi**:
   - Forbidding parallel AI queues by type
   - Jumpjet crash speed fix when crashing onto building
@@ -415,6 +416,7 @@ This page lists all the individual contributions to the project by their author.
   - Build limit group
   - Customizing whether passengers are kicked out when an aircraft fires
   - New SuperWeapon Type template
+  - Fixed some units of Ares crashing after deployment conversion
 - **TwinkleStar**:
   - Custom slaves free sound
   - Jumpjet crash rotation control
@@ -542,7 +544,6 @@ This page lists all the individual contributions to the project by their author.
   - AI vehicle production update code
   - parts of TechnoType conversion placeholder code
 - **ststl, FlyStar, NaotoYuuki, Saigyouji, JunJacobYoung** - Digital Display
-- **ststl, FlyStar** - Fixed some units of Ares crashing after deployment conversion
 - **SukaHati (Erzoid)** - Minimum interceptor guard range
 - **E1 Elite** - TileSet 255 and above bridge repair fix
 - **AutoGavy** - interceptor logic, Warhead critical hit logic

docs/New-or-Enhanced-Logics.md

@@ -1755,7 +1755,9 @@ WarpOutWeapon=                          ; WeaponType
 ### Reset MindControl after transformation
 
 - After the unit conversion is completed, its mind control can be reset.
- - If `Convert.ResetMindControl=no` and there are no warheads in the unit that use `MindControl=yes`, then the controlled units that exceed the maximum value will be released.
+  - If all warheads don't have `MindControl=yes`, then `Convert.ResetMindControl=yes` will release all controlled units.
+  - If any warhead has `MindControl=yes`, then `Convert.ResetMindControl=yes` resets its maximum number of controls.
+  - If all weapons don't have `InfiniteMindControl=yes`, then `Convert.ResetMindControl=yes` release controlled units that exceed the limit.
 
 In `rulesmd.ini`:
 ```ini

src/Ext/Techno/Body.Update.cpp

@@ -166,7 +166,7 @@ bool TechnoExt::ExtData::CheckDeathConditions(bool isInLimbo)
 					if (affectedHouse == AffectedHouse::Owner)
 						return allowLimbo ? HouseExt::ExtMap.Find(pThis->Owner)->CountOwnedPresentAndLimboed(pType) > 0 : pThis->Owner->CountOwnedAndPresent(pType) > 0;
 
-					for (HouseClass* pHouse : HouseClass::Array)
+					for (auto const pHouse : HouseClass::Array)
 					{
 						if (EnumFunctions::CanTargetHouse(affectedHouse, pThis->Owner, pHouse)
 							&& (allowLimbo ? HouseExt::ExtMap.Find(pHouse)->CountOwnedPresentAndLimboed(pType) > 0 : pHouse->CountOwnedAndPresent(pType) > 0))
@@ -603,7 +603,7 @@ void TechnoExt::ExtData::UpdateTypeData(TechnoTypeClass* pCurrentType)
 				// There are too few slaves here. More are needed.
 				const int count = pCurrentType->SlavesNumber - pSlaveManager->SlaveCount;
 
-				for (int index = 0; index < count; index++)
+				for (int i = 0; i < count; i++)
 				{
 					if (auto pSlaveNode = GameCreate<SlaveManagerClass::SlaveControl>())
 					{
@@ -679,7 +679,7 @@ void TechnoExt::ExtData::UpdateTypeData(TechnoTypeClass* pCurrentType)
 				const int count = pCurrentType->SpawnsNumber - pSpawnManager->SpawnCount;
 
 				// Add the missing Spawns, but don't intend for them to be born right away.
-				for (int index = 0; index < count; index++)
+				for (int i = 0; i < count; i++)
 				{
 					if (auto pSpawnNode = GameCreate<SpawnControl>())
 					{
@@ -743,7 +743,7 @@ void TechnoExt::ExtData::UpdateTypeData(TechnoTypeClass* pCurrentType)
 		pSpawnManager->ResetTarget();
 
 		// pSpawnManager->KillNodes() kills all Spawns, but it is not necessary to kill the parts that are not performing tasks.
-		for (auto pSpawnNode : pSpawnManager->SpawnedNodes)
+		for (const auto pSpawnNode : pSpawnManager->SpawnedNodes)
 		{
 			const auto pAircraft = pSpawnNode->Unit;
 			auto& pStatus = pSpawnNode->Status;
@@ -816,59 +816,40 @@ void TechnoExt::ExtData::UpdateTypeData(TechnoTypeClass* pCurrentType)
 			hasParasite = true;
 	};
 
-	for (int index = 0; index < TechnoTypeClass::MaxWeapons; index++)
+	for (int i = 0; i < TechnoTypeClass::MaxWeapons; i++)
 	{
-		checkWeapon(pThis->GetWeapon(index)->WeaponType);
+		checkWeapon(pThis->GetWeapon(i)->WeaponType);
 	}
 
-	auto clearMindControlNode = [pCaptureManager](const int& maxCapture)
-		{
-			// If not exceeded, then stop.
-			if (pCaptureManager->ControlNodes.Count <= maxCapture)
-				return;
-
-			// Remove excess nodes.
-			for (int index = pCaptureManager->ControlNodes.Count - 1; index >= maxCapture; --index)
-			{
-				auto pControlNode = pCaptureManager->ControlNodes.GetItem(index);
-				pCaptureManager->FreeUnit(pControlNode->Unit);
-			}
-		};
-
 	if (maxCapture > 0)
 	{
 		if (!pCaptureManager)
 		{
 			// Rebuild a CaptureManager
 			pCaptureManager = GameCreate<CaptureManagerClass>(pThis, maxCapture, infiniteCapture);
 		}
-		else
+		else if (pOldTypeExt->Convert_ResetMindControl)
 		{
-			if (!infiniteCapture)
+			if (!infiniteCapture && pCaptureManager->ControlNodes.Count > maxCapture)
 			{
-				// It can't be overloaded, so remove the excess nodes.
-				clearMindControlNode(maxCapture);
+				// Remove excess nodes.
+				for (int i = pCaptureManager->ControlNodes.Count - 1; i >= maxCapture; --i)
+				{
+					auto const pControlNode = pCaptureManager->ControlNodes.GetItem(i);
+					pCaptureManager->FreeUnit(pControlNode->Unit);
+				}
 			}
 
 			pCaptureManager->MaxControlNodes = maxCapture;
 			pCaptureManager->InfiniteMindControl = infiniteCapture;
 		}
 	}
-	else if (pCaptureManager)
+	else if (pCaptureManager && pOldTypeExt->Convert_ResetMindControl)
 	{
-		if (pOldTypeExt->Convert_ResetMindControl.Get())
-		{
-			// Remove CaptureManager completely
-			pCaptureManager->FreeAll();
-			GameDelete(pCaptureManager);
-			pCaptureManager = nullptr;
-		}
-		else
-		{
-			// Remove excess mind control node.
-			clearMindControlNode(pCaptureManager->MaxControlNodes);
-			pCaptureManager->InfiniteMindControl = false;
-		}
+		// Remove CaptureManager completely
+		pCaptureManager->FreeAll();
+		GameDelete(pCaptureManager);
+		pCaptureManager = nullptr;
 	}
 
 	if (hasTemporal)
@@ -971,7 +952,7 @@ void TechnoExt::ExtData::UpdateTypeData_Foot()
 			if (auto const count = pCurrentType->MoveSound.Count)
 			{
 				// Play a new sound.
-				int soundIndex = pCurrentType->MoveSound[Randomizer::Global.Random() % count];
+				const int soundIndex = pCurrentType->MoveSound[Randomizer::Global.Random() % count];
 				VocClass::PlayAt(soundIndex, pThis->Location, &pThis->MoveSoundAudioController);
 				pThis->IsMoveSoundPlaying = true;
 			}
@@ -1176,7 +1157,7 @@ void TechnoExt::ExtData::UpdateLaserTrails()
 		if (!this->IsInTunnel)
 			trail.Visible = true;
 
-		CoordStruct trailLoc = TechnoExt::GetFLHAbsoluteCoords(pThis, trail.FLH, trail.IsOnTurret);
+		auto const trailLoc = TechnoExt::GetFLHAbsoluteCoords(pThis, trail.FLH, trail.IsOnTurret);
 
 		if (pThis->CloakState == CloakState::Uncloaking && !trail.Type->CloakVisible)
 			trail.LastLocation = trailLoc;
@@ -1324,7 +1305,7 @@ void TechnoExt::ApplyGainedSelfHeal(TechnoClass* pThis)
 								|| (fromAllies && (!isCampaign || (!pHouse->IsHumanPlayer && !pHouse->IsInPlayerControl)) && pHouse->IsAlliedWith(pOwner));
 						};
 
-					for (auto pHouse : HouseClass::Array)
+					for (auto const pHouse : HouseClass::Array)
 					{
 						if (checkHouse(pHouse))
 						{