Fix factory secondary order menu.

- Show the correct buttons. - Set the pursue, guard, or hold secondary order onto the droids.
Warzone2100 · Mar 24, 2019 · 274fab1 · 274fab1
1 parent 2fb1727
commit 274fab1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/intorder.cpp b/src/intorder.cpp
@@ -415,7 +415,7 @@ static std::vector<AVORDER> buildStructureOrderList(STRUCTURE *psStructure)
 	std::vector<AVORDER> orders(3);
 	orders[0].OrderIndex = 0;//DSO_REPAIR_LEVEL;
 	orders[1].OrderIndex = 1;//DSO_ATTACK_LEVEL;
-	orders[2].OrderIndex = 2;//DSO_HALTTYPE;
+	orders[2].OrderIndex = 5;//DSO_HALTTYPE;
 
 	return orders;
 }

diff --git a/src/structure.cpp b/src/structure.cpp
@@ -2234,6 +2234,10 @@ void setFactorySecondaryState(DROID *psDroid, STRUCTURE *psStructure)
 		{
 			secondarySetState(psDroid, DSO_CIRCLE, (SECONDARY_STATE)(newState & DSS_CIRCLE_MASK));
 		}
+		if ((diff & DSS_HALT_MASK) != 0)
+		{
+			secondarySetState(psDroid, DSO_HALTTYPE, (SECONDARY_STATE)(newState & DSS_HALT_MASK));
+		}
 	}
 }