/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
return RET_SYN;
ax = ap_sect.sct_x;
ay = ap_sect.sct_y;
- if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY)
- || *flightpath == 0)
+ if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY))
return RET_SYN;
tx = ax;
ty = ay;
return RET_SYN;
cno = target.gen.ef_type == EF_SHIP ? target.gen.uid : -1;
- if (ip && ip->i_uid == I_CIVIL
- && target.gen.ef_type == EF_SECTOR
- && target.sect.sct_own != target.sect.sct_oldown) {
- pr("Can't fly civilians into occupied sectors.\n");
- return RET_FAIL;
+ if (ip && ip->i_uid == I_CIVIL) {
+ if (target.gen.own != player->cnum) {
+ pr("Your civilians refuse to board a flight abroad!\n");
+ return RET_FAIL;
+ }
+ if (target.gen.ef_type == EF_SECTOR
+ && target.sect.sct_own != target.sect.sct_oldown) {
+ pr("Can't fly civilians into occupied sectors.\n");
+ return RET_FAIL;
+ }
}
ap_to_target = strlen(flightpath);