From 20199b2236b201f035447a69a75e6e564521154a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 16 Aug 2004 14:35:06 +0000 Subject: [PATCH] (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. --- src/lib/commands/drop.c | 11 +++-------- src/lib/commands/fly.c | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c index f91567cb..08d505a3 100644 --- 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 706a31bd..a485817a 100644 --- 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);