empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
ally.  Since you can load them onto their ships, you should be able to
fly them over.
This commit is contained in:
Markus Armbruster 2004-08-16 14:35:06 +00:00
parent 98a7936c08
commit 20199b2236
2 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/drop.c
View file

@ -99,15 +99,10 @@ drop(void)
if (target.sct_own == player->cnum if (target.sct_own == player->cnum
|| getrel(getnatp(target.sct_own), player->cnum) == ALLIED) { || getrel(getnatp(target.sct_own), player->cnum) == ALLIED) {
if (ip->i_vtype == V_CIVIL) { if (ip->i_vtype == V_CIVIL && target.sct_own != target.sct_oldown) {
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"); pr("Can't drop civilians into occupied sectors.\n");
return RET_FAIL; return RET_FAIL;
} }
}
} else { } else {
/* into the unknown... */ /* into the unknown... */
if (ip->i_vtype != V_SHELL) { if (ip->i_vtype != V_SHELL) {

9
src/lib/commands/fly.c
View file

@ -113,14 +113,9 @@ fly(void)
dst_type = EF_SHIP; dst_type = EF_SHIP;
} }
if (ip && ip->i_vtype == V_CIVIL) { if (ip && ip->i_vtype == V_CIVIL && target.sct_own != target.sct_oldown) {
if (target.sct_own != player->cnum) { pr("Can't fly civilians into occupied sectors.\n");
pr("Your civilians refuse to emigrate!\n");
return RET_FAIL; return RET_FAIL;
} else if (target.sct_own != target.sct_oldown) {
pr("Can't drop civilians into occupied sectors.\n");
return RET_FAIL;
}
} }
ap_to_target = strlen(flightpath); ap_to_target = strlen(flightpath);