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

(genlist): Move from include/mission.h to src/lib/subs/mission.c.

Browse source 
(genlist): Remove unused members x, y.

(genlist): Use void * for generic pointer members cp, thing.  Change
users not to cast.

(oprange): Oops on bad argument.
This commit is contained in:
Markus Armbruster 2006-03-29 07:53:25 +00:00
parent 8383f33229
commit 9847e27a2f
2 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/mission.h
View file

@ -34,8 +34,6 @@
#ifndef MISSION_H #ifndef MISSION_H
#define MISSION_H #define MISSION_H
#include "queue.h"
#define MI_NONE 0 #define MI_NONE 0
#define MI_INTERDICT 1 #define MI_INTERDICT 1
#define MI_SUPPORT 2 #define MI_SUPPORT 2
@ -46,14 +44,6 @@
#define MI_DSUPPORT 7 #define MI_DSUPPORT 7
#define MI_OSUPPORT 8 #define MI_OSUPPORT 8
struct genlist {
struct emp_qelem queue; /* list of units */
int type; /* type of unit */
int x, y; /* x,y it came from */
s_char *cp; /* pointer to desc of thing */
s_char *thing; /* thing's struct */
};
#define SECT_HARDTARGET (-92917) /* a very low number that no-one might pick */ #define SECT_HARDTARGET (-92917) /* a very low number that no-one might pick */
#endif #endif

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

@ -51,9 +51,17 @@
#include "item.h" #include "item.h"
#include <fcntl.h> #include <fcntl.h>
#include "damage.h" #include "damage.h"
#include "queue.h"
#include "prototypes.h" #include "prototypes.h"
#include "optlist.h" #include "optlist.h"
struct genlist {
struct emp_qelem queue; /* list of units */
int type; /* unit type: EF_SHIP, EF_PLANE, EF_LAND */
void *cp; /* pointer to desc of thing */
void *thing; /* thing's struct */
};
struct airport { struct airport {
struct emp_qelem queue; struct emp_qelem queue;
coord x, y; coord x, y;
@ -148,7 +156,7 @@ only_subs(struct emp_qelem *list)
if (glp->type != EF_SHIP) if (glp->type != EF_SHIP)
return 0; return 0;
mcp = (struct mchrstr *)glp->cp; mcp = glp->cp;
if (!(mcp->m_flags & M_SUB)) if (!(mcp->m_flags & M_SUB))
return 0; return 0;
/* It's a sub! */ /* It's a sub! */
@ -373,18 +381,16 @@ 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->x = gp->x;
glp->y = gp->y;
glp->type = type; glp->type = type;
switch (type) { switch (type) {
case EF_LAND: case EF_LAND:
glp->cp = (s_char *)&lchr[(int)gp->type]; glp->cp = &lchr[(int)gp->type];
break; break;
case EF_SHIP: case EF_SHIP:
glp->cp = (s_char *)&mchr[(int)gp->type]; glp->cp = &mchr[(int)gp->type];
break; break;
case EF_PLANE: case EF_PLANE:
glp->cp = (s_char *)&plchr[(int)gp->type]; glp->cp = &plchr[(int)gp->type];
break; break;
} }
glp->thing = malloc(size); glp->thing = malloc(size);
@ -450,12 +456,12 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
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;
gp = (struct genitem *)glp->thing; gp = glp->thing;
md = mapdist(x, y, gp->x, gp->y); md = mapdist(x, y, gp->x, gp->y);
if (glp->type == EF_LAND) { if (glp->type == EF_LAND) {
lp = (struct lndstr *)glp->thing; lp = glp->thing;
if (lp->lnd_effic < LAND_MINFIREEFF) if (lp->lnd_effic < LAND_MINFIREEFF)
continue; continue;
@ -510,8 +516,8 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
cname(lp->lnd_own), prland(lp), xyas(x, y, victim)); cname(lp->lnd_own), prland(lp), xyas(x, y, victim));
} }
} else if (glp->type == EF_SHIP) { } else if (glp->type == EF_SHIP) {
sp = (struct shpstr *)glp->thing; sp = glp->thing;
mcp = (struct mchrstr *)glp->cp; mcp = glp->cp;
if (sp->shp_effic < 60) if (sp->shp_effic < 60)
continue; continue;
@ -646,7 +652,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
putship(sp->shp_uid, sp); putship(sp->shp_uid, sp);
} }
} else if (glp->type == EF_PLANE) { } else if (glp->type == EF_PLANE) {
pcp = (struct plchrstr *)glp->cp; pcp = glp->cp;
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)
@ -957,6 +963,9 @@ oprange(struct genitem *gp, int type, int *radius)
else else
range = ldround((double)plane.pln_range / 2.0, 1);; range = ldround((double)plane.pln_range / 2.0, 1);;
break; break;
default:
CANT_HAPPEN("bad TYPE");
range = -1;
} }
if (*radius > range) if (*radius > range)
@ -1520,16 +1529,14 @@ air_defense(coord x, coord y, natid victim, struct emp_qelem *bomb_list,
emp_initque(&interceptors); emp_initque(&interceptors);
for (qp = mi[cn].queue.q_forw; qp != (&mi[cn].queue); qp = next) { for (qp = mi[cn].queue.q_forw; qp != (&mi[cn].queue); qp = next) {
next = qp->q_forw; next = qp->q_forw;
glp = (struct genlist *)qp; glp = (struct genlist *)qp;
gp = (struct genitem *)glp->thing; gp = glp->thing;
plp = (struct plist *)qp;
dist = mapdist(x, y, gp->x, gp->y); dist = mapdist(x, y, gp->x, gp->y);
plp = malloc(sizeof(struct plist)); plp = malloc(sizeof(struct plist));
memset(plp, 0, sizeof(struct plist)); memset(plp, 0, sizeof(struct plist));
plp->pcp = (struct plchrstr *)glp->cp; plp->pcp = glp->cp;
memcpy(&plp->plane, glp->thing, sizeof(struct plnstr)); memcpy(&plp->plane, glp->thing, sizeof(struct plnstr));
/* missiles go one way, so we can use all the range */ /* missiles go one way, so we can use all the range */