Don't desynch when NullBot VTOLs rearm.

Was triggered when calling orderDroid(droid, DORDER_REARM) from scripts. Fixes ticket:4464.
Warzone2100 · Aug 10, 2016 · 216827c · 216827c
1 parent c6e9dfc
commit 216827c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/qtscriptfuncs.cpp b/src/qtscriptfuncs.cpp
@@ -2509,7 +2509,14 @@ static QScriptValue js_orderDroid(QScriptContext *context, QScriptEngine *)
 	              "Invalid order: %s", getDroidOrderName(order));
 	if (order == DORDER_REARM)
 	{
-		moveToRearm(psDroid);
+		if (STRUCTURE *psStruct = findNearestReArmPad(psDroid, psDroid->psBaseStruct, false))
+		{
+			orderDroidObj(psDroid, order, psStruct, ModeQueue);
+		}
+		else
+		{
+			orderDroid(psDroid, DORDER_RTB, ModeQueue);
+		}
 	}
 	else
 	{