(drop, fly): Fix previous rev. not to prohibit flying civilians to an

ally.  Since you can load them onto their ships, you should be able to
fly them over.

diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c
index f91567cb3f52e755893722f48b5e48d63e2f50ac..08d505a3a2b55893073255e239d038c7c8d3da49 100644 (file)
--- a/src/lib/commands/drop.c
+++ b/src/lib/commands/drop.c
@@ -99,14 +99,9 @@ drop(void)
 
     if (target.sct_own == player->cnum
        || getrel(getnatp(target.sct_own), player->cnum) == ALLIED) {
-       if (ip->i_vtype == V_CIVIL) {
-           if (target.sct_own != player->cnum) {
-               pr("Your civilians refuse to emigrate!\n");
-               return RET_FAIL;
-           } else if (target.sct_own != target.sct_oldown) {
-               pr("Can't drop civilians into occupied sectors.\n");
-               return RET_FAIL;
-           }
+       if (ip->i_vtype == V_CIVIL && target.sct_own != target.sct_oldown) {
+           pr("Can't drop civilians into occupied sectors.\n");
+           return RET_FAIL;
        }
     } else {
        /* into the unknown... */

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index 706a31bd04a9d997efdd2070fc9d322211ccc2cd..a485817a2c900aa8d6cc2d2ce3b42882f4d4448b 100644 (file)
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.c
@@ -113,14 +113,9 @@ fly(void)
        dst_type = EF_SHIP;
     }
 
-    if (ip && ip->i_vtype == V_CIVIL) {
-       if (target.sct_own != player->cnum) {
-           pr("Your civilians refuse to emigrate!\n");
-           return RET_FAIL;
-       } else if (target.sct_own != target.sct_oldown) {
-           pr("Can't drop civilians into occupied sectors.\n");
-           return RET_FAIL;
-       }
+    if (ip && ip->i_vtype == V_CIVIL && target.sct_own != target.sct_oldown) {
+       pr("Can't fly civilians into occupied sectors.\n");
+       return RET_FAIL;
     }
 
     ap_to_target = strlen(flightpath);