From 41b2fa433f25d2594fe0e71620aef59f05e410f2 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 23 Jun 2012 17:48:19 +0200 Subject: [PATCH] Fix fly to permit flying civs to a carrier in an occupied sector Broken in commit 35887222, v4.2.17. --- src/lib/commands/fly.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c index 7296bfd8..89b88d79 100644 --- a/src/lib/commands/fly.c +++ b/src/lib/commands/fly.c @@ -80,7 +80,8 @@ fly(void) if (pln_onewaymission(&target, &cno, &wantflags) < 0) return RET_SYN; - if (ip && ip->i_uid == I_CIVIL && target.sct_own != target.sct_oldown) { + if (ip && ip->i_uid == I_CIVIL + && cno < 0 && target.sct_own != target.sct_oldown) { pr("Can't fly civilians into occupied sectors.\n"); return RET_FAIL; }