/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, 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.
*
* ---
*
* Dave Pare, 1986
*/
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "ship.h"
+#include <config.h>
+
+#include "commands.h"
#include "item.h"
-#include "plane.h"
-#include "nuke.h"
-#include "xy.h"
-#include "nsc.h"
-#include "news.h"
-#include "file.h"
-#include "nat.h"
#include "path.h"
-#include "commands.h"
+#include "plane.h"
+#include "ship.h"
int
drop(void)
{
- s_char *p;
int mission_flags;
- int tech;
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 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;
- s_char buf[1024];
+ 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))
- 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");
+ if (!get_assembly_point(player->argp[3], &ap_sect, buf))
return RET_SYN;
- }
- ax = x;
- ay = y;
- if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, 0, P_FLYING) == 0
+ 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;
tx = ax;
if (target.sct_own == player->cnum
|| getrel(getnatp(target.sct_own), player->cnum) == ALLIED) {
- if (ip->i_vtype == V_CIVIL) {
- 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");
- return RET_FAIL;
- }
+ if (ip->i_uid == I_CIVIL && target.sct_own != target.sct_oldown) {
+ pr("Can't drop civilians into occupied sectors.\n");
+ return RET_FAIL;
}
} else {
/* into the unknown... */
- if (ip->i_vtype != V_SHELL) {
+ if (ip->i_uid != I_SHELL) {
pr("You don't own %s!\n", xyas(tx, ty, player->cnum));
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);
/*
2, P_ESC | P_F, P_M | P_O);
/*
* now arm and equip the bombers, transports, whatever.
- * tech is stored in high 16 bits of mission_flags.
- * yuck.
*/
- tech = 0;
mission_flags |= P_X; /* stealth (shhh) */
mission_flags |= P_H; /* gets turned off if not all choppers */
mission_flags |= P_MINE;
- mission_flags = pln_arm(&bomb_list, 2 * ap_to_target, 'd',
- ip, 0, mission_flags, &tech);
+ mission_flags = pln_arm(&bomb_list, 2 * ap_to_target,
+ wantflags & P_MINE ? 'm' : 'd',
+ ip, 0, mission_flags);
if (QEMPTY(&bomb_list)) {
pr("No planes could be equipped for the mission.\n");
return RET_FAIL;
}
mission_flags = pln_arm(&esc_list, 2 * ap_to_target, 'd',
- ip, P_ESC | P_F, mission_flags, &tech);
+ ip, P_ESC | P_F, mission_flags);
ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
0, 0, 0);
if (QEMPTY(&bomb_list)) {
pr("No planes got through fighter defenses\n");
} else {
getsect(tx, ty, &target);
- if (target.sct_type == SCT_WATER && (mission_flags & P_MINE)
- && ip->i_vtype == V_SHELL)
+ if (wantflags & P_MINE)
pln_mine(&bomb_list, &target);
else
- pln_dropoff(&bomb_list, ip, tx, ty, (s_char *)&target, EF_SECTOR);
+ pln_dropoff(&bomb_list, ip, tx, ty, &target, EF_SECTOR);
}
pln_put(&bomb_list);
pln_put(&esc_list);