From 39a2710482b03b325532f921a24ae726fa92da93 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 23 Feb 2005 15:17:27 +0000 Subject: [PATCH] (reco): Fix check for empty flight path. Aborting the command at the flight path prompt now works. (reco): Pass P_ESC to pln_arm() for consistency with call of pln_sel() and similar code elsewhere. Believed not to make a difference. --- src/lib/commands/reco.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c index 2a7ad06f..ffb3e87f 100644 --- a/src/lib/commands/reco.c +++ b/src/lib/commands/reco.c @@ -81,8 +81,8 @@ reco(void) } ax = x; ay = y; - if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, - 0, P_FLYING) == 0 || *p == 0) + if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, 0, P_FLYING) == 0 + || *flightpath == 0) return RET_SYN; tx = ax; ty = ay; @@ -127,7 +127,7 @@ reco(void) return RET_FAIL; } mission_flags = pln_arm(&esc_list, ap_to_target, 'r', - 0, P_F, mission_flags); + 0, P_F | P_ESC, mission_flags); mission_flags |= PM_R; if (*player->argp[0] == 's')