/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* Known contributors to this file:
* Dave Pare, 1986
* Ken Stevens, 1995
+ * Markus Armbruster, 2004-2011
*/
#include <config.h>
#include "combat.h"
#include "commands.h"
#include "item.h"
-#include "land.h"
-#include "mission.h"
#include "path.h"
#include "plane.h"
#include "ship.h"
static int paradrop(struct emp_qelem *list, coord x, coord y);
int
-para(void)
+c_paradrop(void)
{
coord tx, ty;
coord ax, ay;
return RET_SYN;
ax = ap_sect.sct_x;
ay = ap_sect.sct_y;
- if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING)
- || *flightpath == 0)
+ if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY))
return RET_SYN;
tx = ax;
ty = ay;
getsect(tx, ty, &target);
pr("LZ is %s\n", xyas(tx, ty, player->cnum));
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);
if (target.sct_own == player->cnum) {
pr("You can't air-assault your own sector!\n");
- return RET_FAIL;
- }
+ return RET_FAIL;
+ }
/*
* select planes within range
*/
if (att_abort(A_PARA, NULL, def))
return RET_FAIL;
- /* Show what we're air-assaulting, and check treaties */
-
- if (att_show(def))
- return RET_FAIL;
+ /* Show what we're air-assaulting */
+ att_show(def);
/* set what we're air-assaulting with */
att_combat_init(off, EF_PLANE);
for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
plp = (struct plist *)qp;
- off->troops += plp->misc;
+ off->troops += plp->load;
}
off->mil = off->troops;
if (att_abort(A_PARA, off, def)) {