/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, 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.
*
* ---
*
* fly.c: fly a plane
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 2000
+ * Markus Armbruster, 2004-2009
*/
#include <config.h>
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.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)
{
- int mission_flags;
coord tx, ty;
coord ax, ay;
int ap_to_target;
struct ichrstr *ip;
- s_char flightpath[MAX_PATH_LEN];
- struct shpstr ship;
+ char flightpath[MAX_PATH_LEN];
int cno;
struct nstr_item ni_bomb;
struct nstr_item ni_esc;
struct emp_qelem esc_list;
int wantflags;
struct sctstr ap_sect;
- int dst_type;
- s_char *dst_ptr;
- s_char buf[1024];
+ char buf[1024];
wantflags = 0;
- if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
+ if (get_planes(&ni_bomb, &ni_esc, player->argp[1], player->argp[2]) < 0)
return RET_SYN;
- if (!snxtitem(&ni_esc, EF_PLANE,
- getstarg(player->argp[2], "escort(s)? ", buf)))
- pr("No escorts...\n");
if (!get_assembly_point(player->argp[3], &ap_sect, buf))
return RET_SYN;
ax = ap_sect.sct_x;
cno = -1;
if (pln_onewaymission(&target, &cno, &wantflags) < 0)
return RET_SYN;
- if (cno < 0) {
- dst_ptr = (s_char *)⌖
- dst_type = EF_SECTOR;
- } else {
- getship(cno, &ship);
- dst_ptr = (s_char *)&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);
/*
* select planes within range
*/
- mission_flags = 0;
pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target,
1, wantflags, P_M | P_O);
if (QEMPTY(&bomb_list)) {
/*
* now arm and equip the bombers, transports, whatever.
*/
- mission_flags |= P_X; /* stealth (shhh) */
- mission_flags |= P_H; /* gets turned off if not all choppers */
- mission_flags = pln_arm(&bomb_list, ap_to_target, 't',
- ip, 0, mission_flags);
+ pln_arm(&bomb_list, ap_to_target, 't', ip, 0);
if (QEMPTY(&bomb_list)) {
pr("No planes could be equipped for the mission.\n");
return RET_FAIL;
}
- mission_flags = pln_arm(&esc_list, ap_to_target, 't',
- ip, P_ESC | P_F, mission_flags);
- ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
- 0, 0, 0);
+ pln_arm(&esc_list, ap_to_target, 't', ip, P_ESC | P_F);
+ ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, 0);
if (QEMPTY(&bomb_list)) {
pr("No planes got through fighter defenses\n");
} else {
- getsect(tx, ty, &target);
- pln_dropoff(&bomb_list, ip, tx, ty, dst_ptr, dst_type);
+ pln_dropoff(&bomb_list, ip, tx, ty, cno);
pln_newlanding(&bomb_list, tx, ty, cno);
pln_newlanding(&esc_list, tx, ty, cno);
}