Fix failure to repair commanders on Alt+click.

Cyp · Cyp · commit 56001781bcfc · 2012-09-19T08:47:16.000+02:00
Selecting a repair droid or cyborg and hovering with Alt over a commander would show the repair icon, but do nothing
on click. This was because repair droids would be ordered to do a structure repair on the commander, and repair
cyborgs would be ordered to attack the commander. The repair cyborgs were smarter.

Fixes ticket:1997.
diff --git a/src/order.cpp b/src/order.cpp
@@ -2600,19 +2600,19 @@ DroidOrder chooseOrderObj(DROID *psDroid, BASE_OBJECT *psObj, bool altOrder)
 
 	if (altOrder && (psObj->type == OBJ_DROID || psObj->type == OBJ_STRUCTURE) && psDroid->player == psObj->player)
 	{
-		if ((psDroid->droidType == DROID_WEAPON) || cyborgDroid(psDroid) ||
-			(psDroid->droidType == DROID_COMMAND))
-		{
-			return DroidOrder(DORDER_ATTACK, psObj);
-		}
-		else if (psDroid->droidType == DROID_SENSOR)
+		if (psDroid->droidType == DROID_SENSOR)
 		{
 			return DroidOrder(DORDER_OBSERVE, psObj);
 		}
 		else if ((psDroid->droidType == DROID_REPAIR ||
 		         psDroid->droidType == DROID_CYBORG_REPAIR) && psObj->type == OBJ_DROID)
 		{
-			return DroidOrder(DORDER_REPAIR, psObj);
+			return DroidOrder(DORDER_DROIDREPAIR, psObj);
+		}
+		else if ((psDroid->droidType == DROID_WEAPON) || cyborgDroid(psDroid) ||
+			(psDroid->droidType == DROID_COMMAND))
+		{
+			return DroidOrder(DORDER_ATTACK, psObj);
 		}
 	}
 	//check for transporters first

Original file line number	Diff line number	Diff line change
`@@ -2600,19 +2600,19 @@ DroidOrder chooseOrderObj(DROID psDroid, BASE_OBJECT psObj, bool altOrder)`
`2600`	`2600`
`2601`	`2601`	`if (altOrder && (psObj->type == OBJ_DROID \|\| psObj->type == OBJ_STRUCTURE) && psDroid->player == psObj->player)`
`2602`	`2602`	`{`
`2603`		`- if ((psDroid->droidType == DROID_WEAPON) \|\| cyborgDroid(psDroid) \|\|`
`2604`		`- (psDroid->droidType == DROID_COMMAND))`
`2605`		`- {`
`2606`		`- return DroidOrder(DORDER_ATTACK, psObj);`
`2607`		`- }`
`2608`		`- else if (psDroid->droidType == DROID_SENSOR)`
	`2603`	`+ if (psDroid->droidType == DROID_SENSOR)`
`2609`	`2604`	`{`
`2610`	`2605`	`return DroidOrder(DORDER_OBSERVE, psObj);`
`2611`	`2606`	`}`
`2612`	`2607`	`else if ((psDroid->droidType == DROID_REPAIR \|\|`
`2613`	`2608`	`psDroid->droidType == DROID_CYBORG_REPAIR) && psObj->type == OBJ_DROID)`
`2614`	`2609`	`{`
`2615`		`- return DroidOrder(DORDER_REPAIR, psObj);`
	`2610`	`+ return DroidOrder(DORDER_DROIDREPAIR, psObj);`
	`2611`	`+ }`
	`2612`	`+ else if ((psDroid->droidType == DROID_WEAPON) \|\| cyborgDroid(psDroid) \|\|`
	`2613`	`+ (psDroid->droidType == DROID_COMMAND))`
	`2614`	`+ {`
	`2615`	`+ return DroidOrder(DORDER_ATTACK, psObj);`
`2616`	`2616`	`}`
`2617`	`2617`	`}`
`2618`	`2618`	`//check for transporters first`