Revert remove cameo modifications in 57a1c58

Restore the original optimization methods
Add some comments
Retain original code

Author: CrimRecya

src/Ext/Sidebar/Body.cpp

@@ -40,8 +40,23 @@ bool __stdcall SidebarExt::AresTabCameo_RemoveCameo(BuildType* pItem)
 			return false;
 	}
 
-	// Here we just raise AbandonAll without find factory, rather than check factory and Abandon then find factory and AbandonAll
-	if (pTechnoType)
+	// The following sections have been modified
+	auto buildCat = BuildCat::DontCare;
+
+	if (pItem->ItemType == AbstractType::BuildingType || pItem->ItemType == AbstractType::Building)
+	{
+		buildCat = static_cast<BuildingTypeClass*>(pTechnoType)->BuildCat;
+		const auto pDisplay = DisplayClass::Instance();
+		pDisplay->SetActiveFoundation(nullptr);
+		pDisplay->CurrentBuilding = nullptr;
+		pDisplay->CurrentBuildingType = nullptr;
+		pDisplay->CurrentBuildingOwnerArrayIndex = -1;
+	}
+
+	// AbandonAll contains Abandon, if the factory cannot be found, it will also cannot be found when respont to this event.
+	// The original version added two events, I think it's to solve the problem of BuildCat::Combat because of the hardcode.
+	// Here make correction to the hardcoded BuildCat::DontCare.
+	if (pTechnoType && pCurrent->GetPrimaryFactory(pItem->ItemType, pTechnoType->Naval, buildCat))
 	{
 		const EventClass event
 		(
@@ -54,15 +69,46 @@ bool __stdcall SidebarExt::AresTabCameo_RemoveCameo(BuildType* pItem)
 		EventClass::AddEvent(event);
 	}
 
+	// The original code is as follows
+/*
+	if (pItem->CurrentFactory)
+	{
+		const EventClass event
+		(
+			pCurrent->ArrayIndex,
+			EventType::Abandon,
+			static_cast<int>(pItem->ItemType),
+			pItem->ItemIndex,
+			pTechnoType && pTechnoType->Naval
+		);
+		EventClass::AddEvent(event);
+	}
+
+	auto buildCat = BuildCat::DontCare;
+
 	if (pItem->ItemType == AbstractType::BuildingType || pItem->ItemType == AbstractType::Building)
 	{
-		const auto pDisplay = DisplayClass::Instance();
-		pDisplay->SetActiveFoundation(nullptr);
-		pDisplay->CurrentBuilding = nullptr;
-		pDisplay->CurrentBuildingType = nullptr;
-		pDisplay->CurrentBuildingOwnerArrayIndex = -1;
+		buildCat = static_cast<BuildingTypeClass*>(pTechnoType)->BuildCat;
+		DisplayClass::Instance->SetActiveFoundation(nullptr);
+		DisplayClass::Instance->CurrentBuilding = nullptr;
+		DisplayClass::Instance->CurrentBuildingType = nullptr;
+		DisplayClass::Instance->CurrentBuildingOwnerArrayIndex = -1;
 	}
 
+	// Here make correction to the hardcoded BuildCat::DontCare.
+	if (pTechnoType && pCurrent->GetPrimaryFactory(pItem->ItemType, pTechnoType->Naval, buildCat))
+	{
+		const EventClass event
+		(
+			pCurrent->ArrayIndex,
+			EventType::AbandonAll,
+			static_cast<int>(pItem->ItemType),
+			pItem->ItemIndex,
+			pTechnoType->Naval
+		);
+		EventClass::AddEvent(event);
+	}
+*/
 	return true;
 }