Markus Armbruster
0f1e14f0f3
bomb, drop, fly, paradrop, recon and sweep fail when given a
destination sector equal to the assembly point. Broken in commit
404a76f7, v4.3.27. Reported by Tom Johnson.
Before that commit, getpath() returned NULL on error, "" when input is
an empty path, "h" when it's coordinates of the assembly point, and a
non-empty path otherwise.
The commit accidentally changed it to return "" instead of "h".
Instead of changing it back, make it return NULL when input is an
empty path, and change bomb() & friends to accept empty flight paths.
This also affects sail: it now fails when you give it an empty path,
just like bomb & friends. Path "h" still works.
114 lines
3.5 KiB
C
114 lines
3.5 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure, Markus Armbruster
|
|
*
|
|
* 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 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* ---
|
|
*
|
|
* 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.
|
|
*
|
|
* ---
|
|
*
|
|
* reco.c: Fly a recon mission
|
|
*
|
|
* Known contributors to this file:
|
|
* Dave Pare, 1986
|
|
* Markus Armbruster, 2004-2012
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "commands.h"
|
|
#include "empobj.h"
|
|
#include "path.h"
|
|
#include "plane.h"
|
|
|
|
int
|
|
reco(void)
|
|
{
|
|
int mission_flags = player->argp[0][0] == 's' ? PM_R | PM_S : PM_R;
|
|
coord tx, ty;
|
|
coord ax, ay;
|
|
int ap_to_target;
|
|
char flightpath[MAX_PATH_LEN];
|
|
int cno;
|
|
struct nstr_item ni_bomb;
|
|
struct nstr_item ni_esc;
|
|
union empobj_storage target;
|
|
struct emp_qelem bomb_list;
|
|
struct emp_qelem esc_list;
|
|
int wantflags;
|
|
struct sctstr ap_sect;
|
|
char buf[1024];
|
|
|
|
wantflags = 0;
|
|
if (get_planes(&ni_bomb, &ni_esc, player->argp[1], player->argp[2]) < 0)
|
|
return RET_SYN;
|
|
if (!get_assembly_point(player->argp[3], &ap_sect, buf))
|
|
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))
|
|
return RET_SYN;
|
|
tx = ax;
|
|
ty = ay;
|
|
(void)pathtoxy(flightpath, &tx, &ty, fcost);
|
|
pr("target is %s\n", xyas(tx, ty, player->cnum));
|
|
|
|
if (pln_where_to_land(tx, ty, &target, &wantflags) < 0)
|
|
return RET_SYN;
|
|
cno = target.gen.ef_type == EF_SHIP ? target.gen.uid : -1;
|
|
|
|
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
|
|
*/
|
|
pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target, 1,
|
|
wantflags | (mission_flags & PM_S ? P_SWEEP : 0),
|
|
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_can_land_on_carrier(&bomb_list, &esc_list, &target.ship)) {
|
|
pr("Not enough room on ship #%d!\n", cno);
|
|
return RET_FAIL;
|
|
}
|
|
/*
|
|
* now arm and equip the bombers, transports, whatever.
|
|
*/
|
|
pln_arm(&bomb_list, ap_to_target, 'r', NULL);
|
|
if (QEMPTY(&bomb_list)) {
|
|
pr("No planes could be equipped for the mission.\n");
|
|
return RET_FAIL;
|
|
}
|
|
pln_arm(&esc_list, ap_to_target, 'e', NULL);
|
|
ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags);
|
|
if (QEMPTY(&bomb_list)) {
|
|
pr("No planes got through fighter defenses\n");
|
|
} else {
|
|
getsect(tx, ty, &target);
|
|
pln_newlanding(&bomb_list, tx, ty, cno);
|
|
pln_newlanding(&esc_list, tx, ty, cno);
|
|
}
|
|
pln_put(&bomb_list);
|
|
pln_put(&esc_list);
|
|
return RET_OK;
|
|
}
|