Merge branch 'develop-BuildingQueue' into develop-Mix4BEtest

CrimRecya · Jan 23, 2025 · 26157ee · 26157ee
2 parents 1f9b89f + 5d7e84a
commit 26157ee
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/Ext/Building/Hooks.cpp b/src/Ext/Building/Hooks.cpp
@@ -546,9 +546,7 @@ DEFINE_HOOK(0x4FAAD8, HouseClass_AbandonProduction_RewriteForBuilding, 0x8)
 	GET(const AbstractType, absType, EBP);
 	GET(FactoryClass* const, pFactory, ESI);
 
-	const auto dontCare = buildCat == BuildCat::DontCare;
-
-	if (dontCare || all)
+	if (buildCat == BuildCat::DontCare || all)
 	{
 		const auto pType = TechnoTypeClass::GetByTypeAndIndex(absType, index);
 		const auto firstRemoved = pFactory->RemoveOneFromQueue(pType);
@@ -563,7 +561,7 @@ DEFINE_HOOK(0x4FAAD8, HouseClass_AbandonProduction_RewriteForBuilding, 0x8)
 				return Return;
 		}
 
-		return dontCare ? CheckSame : CheckSame;
+		return CheckSame;
 	}
 
 	if (!pFactory->Object)