]> git.pond.sub.org Git - empserver/commitdiff
Fix fly to permit flying civs to a carrier in an occupied sector
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 23 Jun 2012 15:48:19 +0000 (17:48 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Thu, 12 Jul 2012 17:52:33 +0000 (19:52 +0200)
Broken in commit 35887222, v4.2.17.

src/lib/commands/fly.c

index 7296bfd86594e2d259b34a6256ccfd5465052541..89b88d79da8471133134f95b5f3ed2de237faf3c 100644 (file)
@@ -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;
     }