From a9e10388ab1504fc4a8dc09d4d473a38ff66fc1e Mon Sep 17 00:00:00 2001
From: Guangcong Luo <zarel@wz2100.net>
Date: Tue, 29 Dec 2009 07:51:19 +0000
Subject: [PATCH] Make the SP transport refusal of orders a bit more graceful.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8857 4a71c877-e1ca-e34f-864e-861f7616d084
---
 src/order.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/order.c b/src/order.c
index a7f46b0d5..197ac572f 100644
--- a/src/order.c
+++ b/src/order.c
@@ -2740,11 +2740,11 @@ void orderSelectedLocAdd(UDWORD player, UDWORD x, UDWORD y, BOOL add)
 		if (psCurr->selected)
 		{
 			// can't use bMultiPlayer since multimsg could be off.
-			if (psCurr->droidType == DROID_TRANSPORTER && game.type != SKIRMISH)
+			if (psCurr->droidType == DROID_TRANSPORTER && game.type == CAMPAIGN)
 			{
-				// Never, ever, let users mess with the SP Trasnsporter
-				// it is script controlled, and will break things!
-				break;
+				// Transport in campaign cannot be controlled by players
+				DeSelectDroid(psCurr);
+				continue;
 			}
 
 			order = chooseOrderLoc(psCurr, x, y);