tweak: Still clear previous task if the resumed build fails

Stubbjax · Stubbjax · commit 74beb3592aa9 · 2026-06-15T02:38:12.000+10:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -2072,10 +2072,9 @@ void DozerAIUpdate::resumePreviousTask()
 	if (m_previousTask == DOZER_TASK_BUILD)
 	{
 		Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);
-		if (target && !target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
-			return;
+		if (!target || target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
+			newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 
-		newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 		m_previousTask = DOZER_TASK_INVALID;
 		m_previousTaskInfo = DozerTaskInfo();
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -727,10 +727,9 @@ void WorkerAIUpdate::resumePreviousTask()
 	if (m_previousTask == DOZER_TASK_BUILD)
 	{
 		Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);
-		if (target && !target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
-			return;
+		if (!target || target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
+			newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 
-		newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 		m_previousTask = DOZER_TASK_INVALID;
 		m_previousTaskInfo = DozerTaskInfo();
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -2077,10 +2077,9 @@ void DozerAIUpdate::resumePreviousTask()
 	if (m_previousTask == DOZER_TASK_BUILD)
 	{
 		Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);
-		if (target && !target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
-			return;
+		if (!target || target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
+			newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 
-		newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 		m_previousTask = DOZER_TASK_INVALID;
 		m_previousTaskInfo = DozerTaskInfo();
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -727,10 +727,9 @@ void WorkerAIUpdate::resumePreviousTask()
 	if (m_previousTask == DOZER_TASK_BUILD)
 	{
 		Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);
-		if (target && !target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
-			return;
+		if (!target || target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
+			newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 
-		newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 		m_previousTask = DOZER_TASK_INVALID;
 		m_previousTaskInfo = DozerTaskInfo();
 	}

Original file line number	Diff line number	Diff line change
`@@ -2072,10 +2072,9 @@ void DozerAIUpdate::resumePreviousTask()`
`2072`	`2072`	`if (m_previousTask == DOZER_TASK_BUILD)`
`2073`	`2073`	`{`
`2074`	`2074`	`Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);`
`2075`		`- if (target && !target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))`
`2076`		`- return;`
	`2075`	`+ if (!target \|\| target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))`
	`2076`	`+ newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));`
`2077`	`2077`
`2078`		`- newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));`
`2079`	`2078`	`m_previousTask = DOZER_TASK_INVALID;`
`2080`	`2079`	`m_previousTaskInfo = DozerTaskInfo();`
`2081`	`2080`	`}`
Original file line number	Diff line number	Diff line change
`@@ -727,10 +727,9 @@ void WorkerAIUpdate::resumePreviousTask()`
`727`	`727`	`if (m_previousTask == DOZER_TASK_BUILD)`
`728`	`728`	`{`
`729`	`729`	`Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);`
`730`		`- if (target && !target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))`
`731`		`- return;`
	`730`	`+ if (!target \|\| target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))`
	`731`	`+ newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));`
`732`	`732`
`733`		`- newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));`
`734`	`733`	`m_previousTask = DOZER_TASK_INVALID;`
`735`	`734`	`m_previousTaskInfo = DozerTaskInfo();`
`736`	`735`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2077,10 +2077,9 @@ void DozerAIUpdate::resumePreviousTask()`
`2077`	`2077`	`if (m_previousTask == DOZER_TASK_BUILD)`
`2078`	`2078`	`{`
`2079`	`2079`	`Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);`
`2080`		`- if (target && !target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))`
`2081`		`- return;`
	`2080`	`+ if (!target \|\| target->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))`
	`2081`	`+ newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));`
`2082`	`2082`
`2083`		`- newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));`
`2084`	`2083`	`m_previousTask = DOZER_TASK_INVALID;`
`2085`	`2084`	`m_previousTaskInfo = DozerTaskInfo();`
`2086`	`2085`	`}`