/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* Steve McClure, 2000
*/
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
+#include <config.h>
+
+#include "commands.h"
#include "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
#include "path.h"
-#include "commands.h"
+#include "plane.h"
+#include "ship.h"
int
fly(void)
{
- s_char *p;
int mission_flags;
coord tx, ty;
coord ax, ay;
int ap_to_target;
struct ichrstr *ip;
- s_char flightpath[MAX_PATH_LEN];
+ char flightpath[MAX_PATH_LEN];
struct shpstr ship;
int cno;
struct nstr_item ni_bomb;
struct nstr_item ni_esc;
- coord x, y;
struct sctstr target;
struct emp_qelem bomb_list;
struct emp_qelem esc_list;
int wantflags;
struct sctstr ap_sect;
int dst_type;
- s_char *dst_ptr;
- s_char buf[1024];
+ void *dst_ptr;
+ char buf[1024];
wantflags = 0;
if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
if (!snxtitem(&ni_esc, EF_PLANE,
getstarg(player->argp[2], "escort(s)? ", buf)))
pr("No escorts...\n");
- if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
- || *p == 0)
- return RET_SYN;
- if (!sarg_xy(p, &x, &y) || !getsect(x, y, &ap_sect))
+ if (!get_assembly_point(player->argp[3], &ap_sect, buf))
return RET_SYN;
- if (ap_sect.sct_own && ap_sect.sct_own != player->cnum &&
- getrel(getnatp(ap_sect.sct_own), player->cnum) != ALLIED) {
- pr("Assembly point not owned by you or an ally!\n");
- return RET_SYN;
- }
- ax = x;
- ay = y;
+ ax = ap_sect.sct_x;
+ ay = ap_sect.sct_y;
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING) == 0
|| *flightpath == 0)
return RET_SYN;
if (pln_onewaymission(&target, &cno, &wantflags) < 0)
return RET_SYN;
if (cno < 0) {
- dst_ptr = (s_char *)⌖
+ dst_ptr = ⌖
dst_type = EF_SECTOR;
} else {
getship(cno, &ship);
- dst_ptr = (s_char *)&ship;
+ dst_ptr = &ship;
dst_type = EF_SHIP;
}
- if (ip && ip->i_vtype == I_CIVIL && target.sct_own != target.sct_oldown) {
+ if (ip && ip->i_uid == I_CIVIL && target.sct_own != target.sct_oldown) {
pr("Can't fly civilians into occupied sectors.\n");
return RET_FAIL;
}
ap_to_target = strlen(flightpath);
- if (*(flightpath + strlen(flightpath) - 1) == 'h')
+ if (flightpath[ap_to_target - 1] == 'h')
ap_to_target--;
pr("range to target is %d\n", ap_to_target);
/*