Fix wall construction whereas builder was dropped **twice** from buil…

…ding(blocking one extra tile).
Wargus · Aug 7, 2023 · 519f10c · 519f10c
1 parent 8fc8d82
commit 519f10c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/action/action_built.cpp b/src/action/action_built.cpp
@@ -136,7 +136,7 @@ static void CancelBuilt(COrder_Built &order, CUnit *unit)
 	CUnit *worker = order.GetWorkerPtr();
 
 	// Drop out unit
-	if (worker != nullptr && worker->CurrentAction() == UnitActionBuild) {
+	if (worker != nullptr && worker->CurrentAction() == UnitActionBuild && !worker->CurrentOrder()->Finished) {
 		worker->ClearAction();
 
 		DropOutOnSide(*worker, LookingW, unit);
@@ -222,6 +222,7 @@ static void Finish(COrder_Built &order, CUnit &unit)
 	// FIXME: Johns: hardcoded unit-type wall / more races!
 	if (&type == UnitTypeOrcWall || &type == UnitTypeHumanWall) {
 		Map.SetWall(unit.tilePos, &type == UnitTypeHumanWall);
+		order.Finished = true;
 		unit.Remove(nullptr);
 		UnitLost(unit);
 		UnitClearOrders(unit);