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

Remove struct genlist member cp

Browse source
This commit is contained in:
Markus Armbruster 2010-01-09 13:49:34 +01:00
parent 2e69a24402
commit 5e77193cf0
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,6 @@
struct genlist { struct genlist {
struct emp_qelem queue; /* list of units */ struct emp_qelem queue; /* list of units */
void *cp; /* pointer to desc of thing */
struct empobj *thing; /* thing's struct */ struct empobj *thing; /* thing's struct */
}; };
@ -150,15 +149,13 @@ only_subs(struct emp_qelem *list)
{ {
struct emp_qelem *qp; struct emp_qelem *qp;
struct genlist *glp; struct genlist *glp;
struct mchrstr *mcp;
for (qp = list->q_forw; qp != list; qp = qp->q_forw) { for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
glp = (struct genlist *)qp; glp = (struct genlist *)qp;
if (glp->thing->ef_type != EF_SHIP) if (glp->thing->ef_type != EF_SHIP)
return 0; return 0;
mcp = glp->cp; if (!(mchr[glp->thing->type].m_flags & M_SUB))
if (!(mcp->m_flags & M_SUB))
return 0; return 0;
/* It's a sub! */ /* It's a sub! */
} }
@ -351,7 +348,6 @@ build_mission_list_type(struct genlist *mi, coord x, coord y, int mission,
glp = malloc(sizeof(struct genlist)); glp = malloc(sizeof(struct genlist));
memset(glp, 0, sizeof(struct genlist)); memset(glp, 0, sizeof(struct genlist));
glp->cp = get_empobj_chr(gp);
glp->thing = malloc(sizeof(item)); glp->thing = malloc(sizeof(item));
memcpy(glp->thing, &item, sizeof(item)); memcpy(glp->thing, &item, sizeof(item));
emp_insque(&glp->queue, &mi[gp->own].queue); emp_insque(&glp->queue, &mi[gp->own].queue);
@ -410,7 +406,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
x, y, victim, mission, s, x, y, victim, mission, s,
targeting_ships); targeting_ships);
} else if (glp->thing->ef_type == EF_PLANE) { } else if (glp->thing->ef_type == EF_PLANE) {
pcp = glp->cp; pcp = &plchr[glp->thing->type];
if (pcp->pl_flags & P_M) if (pcp->pl_flags & P_M)
/* units have their own missile interdiction */ /* units have their own missile interdiction */
if (hardtarget != SECT_HARDTARGET || pcp->pl_flags & P_MAR) if (hardtarget != SECT_HARDTARGET || pcp->pl_flags & P_MAR)