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

Simplify perform_mission()

Browse source
This commit is contained in:
Markus Armbruster 2010-01-09 14:22:51 +01:00
parent 5e77193cf0
commit 3ce3b2e387
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -384,18 +384,16 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
struct emp_qelem *qp, missiles, bombers; struct emp_qelem *qp, missiles, bombers;
struct genlist *glp; struct genlist *glp;
struct plist *plp; struct plist *plp;
struct sctstr sect;
struct plchrstr *pcp; struct plchrstr *pcp;
int dam = 0; int dam = 0;
int targeting_ships = *s == 's'; /* "subs" or "ships" FIXME gross! */ int targeting_ships = *s == 's'; /* "subs" or "ships" FIXME gross! */
getsect(x, y, &sect);
emp_initque(&missiles); emp_initque(&missiles);
emp_initque(&bombers); emp_initque(&bombers);
for (qp = list->q_forw; qp != list; qp = qp->q_forw) { for (qp = list->q_forw; qp != list; ) {
glp = (struct genlist *)qp; glp = (struct genlist *)qp;
qp = qp->q_forw;
if (glp->thing->ef_type == EF_LAND) { if (glp->thing->ef_type == EF_LAND) {
dam = perform_mission_land(dam, (struct lndstr *)glp->thing, dam = perform_mission_land(dam, (struct lndstr *)glp->thing,
@ -426,21 +424,14 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
CANT_REACH(); CANT_REACH();
break; break;
} }
free(glp->thing);
free(glp);
} }
dam = perform_mission_msl(dam, &missiles, x, y, victim, hardtarget); dam = perform_mission_msl(dam, &missiles, x, y, victim, hardtarget);
dam = perform_mission_bomb(dam, &bombers, x, y, victim, mission, s, dam = perform_mission_bomb(dam, &bombers, x, y, victim, mission, s,
hardtarget, targeting_ships); hardtarget, targeting_ships);
qp = list->q_forw;
while (qp != list) {
glp = (struct genlist *)qp;
qp = qp->q_forw;
free(glp->thing);
free(glp);
}
return dam; return dam;
} }