[Minor] Notify the completed building in building production queue (#1517)

If enable the building production queue, when a building is fully
completed, the remaining buildings will be turned into gray cameo as
before.
Also simplified the code of recheck cameo.

Author: CrimRecya

src/Ext/Building/Hooks.cpp

@@ -601,7 +601,24 @@ DEFINE_HOOK(0x6A9789, StripClass_DrawStrip_NoGreyCameo, 0x6)
 	GET(TechnoTypeClass* const, pType, EBX);
 	GET_STACK(bool, clicked, STACK_OFFSET(0x48C, -0x475));
 
-	return (!RulesExt::Global()->BuildingProductionQueue && pType->WhatAmI() == AbstractType::BuildingType && clicked) ? SkipGameCode : ContinueCheck;
+	if (!RulesExt::Global()->BuildingProductionQueue)
+	{
+		if (pType->WhatAmI() == AbstractType::BuildingType && clicked)
+			return SkipGameCode;
+	}
+	else if (const auto pBuildingType = abstract_cast<BuildingTypeClass*>(pType))
+	{
+		if (const auto pFactory = HouseClass::CurrentPlayer->GetPrimaryFactory(AbstractType::BuildingType, pType->Naval, pBuildingType->BuildCat))
+		{
+			if (const auto pProduct = abstract_cast<BuildingClass*>(pFactory->Object))
+			{
+				if (pFactory->IsDone() && pProduct->Type != pType && ((pProduct->Type->BuildCat != BuildCat::Combat) ^ (pBuildingType->BuildCat == BuildCat::Combat)))
+					return SkipGameCode;
+			}
+		}
+	}
+
+	return ContinueCheck;
 }
 
 DEFINE_HOOK(0x6AA88D, StripClass_RecheckCameo_FindFactoryDehardCode, 0x6)

src/Ext/Sidebar/Body.cpp

@@ -29,7 +29,7 @@ bool __stdcall SidebarExt::AresTabCameo_RemoveCameo(BuildType* pItem)
 	{
 		const auto pFactory = pTechnoType->FindFactory(true, false, false, pCurrent);
 
-		if (pFactory && pFactory->Owner->CanBuild(pTechnoType, false, true) != CanBuildResult::Unbuildable)
+		if (pFactory && pCurrent->CanBuild(pTechnoType, false, true) != CanBuildResult::Unbuildable)
 			return false;
 	}
 	else
@@ -40,32 +40,27 @@ bool __stdcall SidebarExt::AresTabCameo_RemoveCameo(BuildType* pItem)
 			return false;
 	}
 
-	if (pItem->CurrentFactory)
+	// Here we just raise AbandonAll without find factory, rather than check factory and Abandon then find factory and AbandonAll
+	if (pTechnoType)
 	{
-		EventClass event = EventClass(pCurrent->ArrayIndex, EventType::Abandon, static_cast<int>(pItem->ItemType), pItem->ItemIndex, pTechnoType && pTechnoType->Naval);
+		const EventClass event
+		(
+			pCurrent->ArrayIndex,
+			EventType::AbandonAll,
+			static_cast<int>(pItem->ItemType),
+			pItem->ItemIndex,
+			pTechnoType->Naval
+		);
 		EventClass::AddEvent(event);
 	}
 
 	if (pItem->ItemType == AbstractType::BuildingType || pItem->ItemType == AbstractType::Building)
 	{
-		DisplayClass::Instance->CurrentBuilding = nullptr;
-		DisplayClass::Instance->CurrentBuildingType = nullptr;
-		DisplayClass::Instance->CurrentBuildingOwnerArrayIndex = -1;
-		DisplayClass::Instance->SetActiveFoundation(nullptr);
-	}
-
-	if (pTechnoType)
-	{
-		const auto absType = pTechnoType->WhatAmI();
-
-		// Here we make correction to the hardcoded BuildCat::DontCare
-		const auto buildCat = absType == AbstractType::BuildingType ? static_cast<BuildingTypeClass*>(pTechnoType)->BuildCat : BuildCat::DontCare;
-
-		if (pCurrent->GetPrimaryFactory(absType, pTechnoType->Naval, buildCat))
-		{
-			EventClass event = EventClass(pCurrent->ArrayIndex, EventType::AbandonAll, static_cast<int>(pItem->ItemType), pItem->ItemIndex, pTechnoType->Naval);
-			EventClass::AddEvent(event);
-		}
+		const auto pDisplay = DisplayClass::Instance();
+		pDisplay->SetActiveFoundation(nullptr);
+		pDisplay->CurrentBuilding = nullptr;
+		pDisplay->CurrentBuildingType = nullptr;
+		pDisplay->CurrentBuildingOwnerArrayIndex = -1;
 	}
 
 	return true;