(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.
This commit is contained in:
parent
bca00f35f5
commit
39a2710482
1 changed files with 3 additions and 3 deletions
|
@ -81,8 +81,8 @@ reco(void)
|
||||||
}
|
}
|
||||||
ax = x;
|
ax = x;
|
||||||
ay = y;
|
ay = y;
|
||||||
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0,
|
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, 0, P_FLYING) == 0
|
||||||
0, P_FLYING) == 0 || *p == 0)
|
|| *flightpath == 0)
|
||||||
return RET_SYN;
|
return RET_SYN;
|
||||||
tx = ax;
|
tx = ax;
|
||||||
ty = ay;
|
ty = ay;
|
||||||
|
@ -127,7 +127,7 @@ reco(void)
|
||||||
return RET_FAIL;
|
return RET_FAIL;
|
||||||
}
|
}
|
||||||
mission_flags = pln_arm(&esc_list, ap_to_target, 'r',
|
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;
|
mission_flags |= PM_R;
|
||||||
|
|
||||||
if (*player->argp[0] == 's')
|
if (*player->argp[0] == 's')
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue