[Minor] Fix an issue related to construction (#1933)

Fix the issue where AI cannot repair construction yard when using
`AIForbidConyard`.
Optimize and remove some useless checks related to abandon construction.

Author: CrimRecya

src/Ext/Building/Hooks.cpp

@@ -631,45 +631,32 @@ DEFINE_HOOK(0x4C9C7B, FactoryClass_QueueProduction_ForceCheckBuilding, 0x7)
 	return RulesExt::Global()->BuildingProductionQueue ? SkipGameCode : 0;
 }
 
+DEFINE_JUMP(LJMP, 0x4FABEE, 0x4FAB3D)
+
 DEFINE_HOOK(0x4FAAD8, HouseClass_AbandonProduction_RewriteForBuilding, 0x8)
 {
-	enum { CheckSame = 0x4FAB3D, SkipCheck = 0x4FAB64, Return = 0x4FAC9B };
+	enum { CheckSame = 0x4FAB3D, Return = 0x4FAC9B };
 
 	GET_STACK(const bool, all, STACK_OFFSET(0x18, 0x10));
 	GET(const int, index, EBX);
-	GET(const BuildCat, buildCat, ECX);
 	GET(const AbstractType, absType, EBP);
 	GET(FactoryClass* const, pFactory, ESI);
 
-	if (buildCat == BuildCat::DontCare || all)
-	{
-		const auto pType = TechnoTypeClass::GetByTypeAndIndex(absType, index);
-		const auto firstRemoved = pFactory->RemoveOneFromQueue(pType);
+	const auto pType = TechnoTypeClass::GetByTypeAndIndex(absType, index);
+	const auto firstRemoved = pFactory->RemoveOneFromQueue(pType);
 
-		if (firstRemoved)
-		{
-			SidebarClass::Instance.SidebarBackgroundNeedsRedraw = true; // Added, force redraw strip
-			SidebarClass::Instance.RepaintSidebar(SidebarClass::GetObjectTabIdx(absType, index, 0));
-
-			if (all)
-				while (pFactory->RemoveOneFromQueue(pType));
-			else
-				return Return;
-		}
+	if (firstRemoved)
+	{
+		SidebarClass::Instance.SidebarBackgroundNeedsRedraw = true; // Added, force redraw strip
+		SidebarClass::Instance.RepaintSidebar(SidebarClass::GetObjectTabIdx(absType, index, 0));
 
-		return CheckSame;
+		if (all)
+			while (pFactory->RemoveOneFromQueue(pType));
+		else
+			return Return;
 	}
 
-	if (!pFactory->Object)
-		return SkipCheck;
-
-	if (!pFactory->RemoveOneFromQueue(TechnoTypeClass::GetByTypeAndIndex(absType, index)))
-		return CheckSame;
-
-	SidebarClass::Instance.SidebarBackgroundNeedsRedraw = true; // Added, force redraw strip
-	SidebarClass::Instance.RepaintSidebar(SidebarClass::GetObjectTabIdx(absType, index, 0));
-
-	return Return;
+	return CheckSame;
 }
 
 DEFINE_HOOK(0x6A9C54, StripClass_DrawStrip_FindFactoryDehardCode, 0x6)

src/Ext/BuildingType/Hooks.Placing.cpp

@@ -138,26 +138,6 @@ DEFINE_HOOK(0x42EB8E, BaseClass_GetBaseNodeIndex_CheckValidBaseNode, 0x6)
 	return reinterpret_cast<bool(__thiscall*)(HouseClass*, BaseNodeClass*)>(0x50CAD0)(pBase->Owner, pBaseNode) ? Valid : Invalid;
 }
 
-// AIConstructionYard Hook #4-3 -> sub_7393C0 - Prohibit AI from building construction yard.
-DEFINE_HOOK(0x7397F4, UnitClass_TryToDeploy_SkipSetShouldRebuild, 0x7)
-{
-	enum { SkipRebuildFlag = 0x7397FB };
-
-	GET(BuildingClass* const, pBuilding, EBX);
-
-	return (pBuilding->Type->ConstructionYard && RulesExt::Global()->AIForbidConYard) ? SkipRebuildFlag : 0;
-}
-
-// AIConstructionYard Hook #4-4 -> sub_440580 - Prohibit AI from building construction yard.
-DEFINE_HOOK(0x440B7A, BuildingClass_Unlimbo_SkipSetShouldRebuild, 0x7)
-{
-	enum { SkipRebuildFlag = 0x440B81 };
-
-	GET(BuildingClass* const, pBuilding, ESI);
-
-	return (pBuilding->Type->ConstructionYard && RulesExt::Global()->AIForbidConYard) ? SkipRebuildFlag : 0;
-}
-
 // AIConstructionYard Hook #5-1 -> sub_588570 - Only expand walls on nodes.
 DEFINE_HOOK(0x5885D1, MapClass_BuildingToFirestormWall_SkipExtraWalls, 0x6)
 {