Allow queueing of artefact/barrel pickup.

Fixes ticket:2725.
Warzone2100 · Jan 1, 2012 · ade80e8 · ade80e8
1 parent 9ba84b1
commit ade80e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/src/display.cpp b/src/display.cpp
@@ -2018,14 +2018,7 @@ static void dealWithLMBFeature(FEATURE* psFeature)
 						break;
 					}
 
-					if (ctrlShiftDown())
-					{
-						orderDroidStatsLocDirAdd(psCurr, DORDER_BUILD, &asStructureStats[i], psFeature->pos.x, psFeature->pos.y, player.r.y);
-					}
-					else
-					{
-						orderDroidStatsLocDir(psCurr, DORDER_BUILD, &asStructureStats[i], psFeature->pos.x, psFeature->pos.y, player.r.y, ModeQueue);
-					}
+					sendDroidInfo(psCurr, DroidOrder(DORDER_BUILD, &asStructureStats[i], removeZ(psFeature->pos), player.r.y), ctrlShiftDown());
 					FeedbackOrderGiven();
 				}
 			}
@@ -2044,12 +2037,7 @@ static void dealWithLMBFeature(FEATURE* psFeature)
 				/* If so then find the nearest unit! */
 				if (psNearestUnit)	// bloody well should be!!!
 				{
-					orderDroidObj(psNearestUnit, DORDER_RECOVER, (BASE_OBJECT *)psFeature, ModeQueue);
-					FeedbackOrderGiven();
-				}
-				else
-				{
-					orderSelectedObj(selectedPlayer, (BASE_OBJECT*)psFeature);
+					sendDroidInfo(psNearestUnit, DroidOrder(DORDER_RECOVER, psFeature), ctrlShiftDown());
 					FeedbackOrderGiven();
 				}
 				break;

diff --git a/src/order.cpp b/src/order.cpp
@@ -2290,6 +2290,7 @@ bool orderDroidList(DROID *psDroid)
 		case DORDER_DEMOLISH:
 		case DORDER_HELPBUILD:
 		case DORDER_BUILDMODULE:
+		case DORDER_RECOVER:
 			ASSERT(sOrder.psStats == NULL, "Extra %s parameters.", getDroidOrderName(sOrder.type));
 			sOrder.psStats = NULL;
 			break;