/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2018, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 2000
- * Markus Armbruster, 2004-2011
+ * Markus Armbruster, 2004-2012
*/
#include <config.h>
#include "commands.h"
+#include "empobj.h"
#include "item.h"
#include "path.h"
#include "plane.h"
int cno;
struct nstr_item ni_bomb;
struct nstr_item ni_esc;
- struct sctstr target;
+ union empobj_storage target;
struct emp_qelem bomb_list;
struct emp_qelem esc_list;
int wantflags;
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;
ip = whatitem(player->argp[5], "transport what? ");
if (player->aborted)
return RET_SYN;
- getsect(tx, ty, &target);
- cno = -1;
- if (pln_onewaymission(&target, &cno, &wantflags) < 0)
+ if (pln_where_to_land(tx, ty, &target, &wantflags) < 0)
return RET_SYN;
+ cno = target.gen.ef_type == EF_SHIP ? target.gen.uid : -1;
- 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;
+ 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);
- if (flightpath[ap_to_target - 1] == 'h')
- ap_to_target--;
pr("range to target is %d\n", ap_to_target);
/*
* select planes within range
wantflags, P_M | P_O);
pln_sel(&ni_esc, &esc_list, &ap_sect, ap_to_target, 1,
wantflags | P_ESC | P_F, P_M | P_O);
- if (cno >= 0 && !pln_oneway_to_carrier_ok(&bomb_list, &esc_list, cno)) {
+ if (cno >= 0
+ && !pln_can_land_on_carrier(&bomb_list, &esc_list, &target.ship)) {
pr("Not enough room on ship #%d!\n", cno);
return RET_FAIL;
}