empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(pln_equip): New mission argument 'm' for mining. 'd' is now for

Browse source 
cargo drops only.  Callers changed.
This commit is contained in:
Markus Armbruster 2005-12-22 19:48:33 +00:00
parent 8e12bb8574
commit ea93842927
2 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/commands/drop.c
View file

@ -120,7 +120,8 @@ drop(void)
mission_flags |= P_X; /* stealth (shhh) */ mission_flags |= P_X; /* stealth (shhh) */
mission_flags |= P_H; /* gets turned off if not all choppers */ mission_flags |= P_H; /* gets turned off if not all choppers */
mission_flags |= P_MINE; mission_flags |= P_MINE;
mission_flags = pln_arm(&bomb_list, 2 * ap_to_target, 'd', mission_flags = pln_arm(&bomb_list, 2 * ap_to_target,
wantflags & P_MINE ? 'm' : 'd',
ip, 0, mission_flags); ip, 0, mission_flags);
if (QEMPTY(&bomb_list)) { if (QEMPTY(&bomb_list)) {
pr("No planes could be equipped for the mission.\n"); pr("No planes could be equipped for the mission.\n");

16
src/lib/subs/plnsub.c
View file

@ -651,23 +651,17 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, s_char mission)
} }
break; break;
case 't': case 't':
case 'd':
if ((pcp->pl_flags & P_C) == 0 || ip == 0) if ((pcp->pl_flags & P_C) == 0 || ip == 0)
break; break;
itype = ip->i_vtype; itype = ip->i_vtype;
needed = (pp->pln_load * 2) / ip->i_lbs; needed = (pp->pln_load * 2) / ip->i_lbs;
break; break;
case 'd': case 'm':
itype = ip->i_vtype; if ((pcp->pl_flags & P_MINE) == 0)
break;
itype = I_SHELL;
needed = (pp->pln_load * 2) / ip->i_lbs; needed = (pp->pln_load * 2) / ip->i_lbs;
/* Is this mine dropping excursion? */
if (itype == I_SHELL && (pcp->pl_flags & P_MINE))
break;
/* Is this a cargo drop? */
if ((pcp->pl_flags & P_C) == 0 || ip == 0) {
itype = 0;
needed = 0;
break;
}
break; break;
case 'a': case 'a':
if ((pcp->pl_flags & (P_V | P_C)) == 0) if ((pcp->pl_flags & (P_V | P_C)) == 0)