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

Clean up outmoded tests for paradrop capability

Browse source 
Initially, paradrop capability was implied both by capability cargo
and by capability VTOL.  Chainsaw changed para() to require cargo, and
added compile-time option PARAFLAG to additionally require new
capability para.  The optional PARAFLAG rule became mandatory in
Empire 2.

Chainsaw left the old tests for "cargo or VTOL" in place.  Because
para() checked "cargo and para" first, the old tests for "cargo or
VTOL" always passed, so they had no effect.

Clean them up anyway.
This commit is contained in:
Markus Armbruster 2009-09-27 10:55:33 -04:00
parent 062a42fb7b
commit df1ca95a2a
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,8 +142,7 @@ paradrop(struct emp_qelem *list, coord x, coord y)
att_combat_init(off, EF_PLANE); att_combat_init(off, EF_PLANE);
for (qp = list->q_forw; qp != list; qp = qp->q_forw) { for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
plp = (struct plist *)qp; plp = (struct plist *)qp;
if (plp->pcp->pl_flags & (P_V | P_C)) off->troops += plp->misc;
off->troops += plp->misc;
} }
off->mil = off->troops; off->mil = off->troops;
if (att_abort(A_PARA, off, def)) { if (att_abort(A_PARA, off, def)) {

2
src/lib/subs/mission.c
View file

@ -917,7 +917,7 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
needed = (load * 2) / ip->i_lbs; needed = (load * 2) / ip->i_lbs;
break; break;
case 'a': /* paradrop */ case 'a': /* paradrop */
if ((pcp->pl_flags & (P_V | P_C)) == 0) if (!(pcp->pl_flags & P_P))
break; break;
itype = I_MILIT; itype = I_MILIT;
needed = load / ichr[I_MILIT].i_lbs; needed = load / ichr[I_MILIT].i_lbs;

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

@ -666,7 +666,7 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
needed = (load * 2) / ichr[I_SHELL].i_lbs; needed = (load * 2) / ichr[I_SHELL].i_lbs;
break; break;
case 'a': /* paradrop */ case 'a': /* paradrop */
if ((pcp->pl_flags & (P_V | P_C)) == 0) if (!(pcp->pl_flags & P_P))
break; break;
itype = I_MILIT; itype = I_MILIT;
needed = load / ichr[I_MILIT].i_lbs; needed = load / ichr[I_MILIT].i_lbs;