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

(mission, build_mission_list_type, show_mission, oprange): Remove the

Browse source 
type parameter as it can be determined from the empobj parameter.

(oprange): Remove getting the unit information again as it is contained
in the empobj parameter passed in.
This commit is contained in:
Ron Koenderink 2006-07-09 10:57:24 +00:00
parent a33f1378e8
commit 5ea9060132
3 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -495,7 +495,7 @@ extern int ground_interdict(coord, coord, natid, char *);
extern int unit_interdict(coord, coord, natid, char *, int, int); extern int unit_interdict(coord, coord, natid, char *, int, int);
extern int off_support(coord, coord, natid, natid); extern int off_support(coord, coord, natid, natid);
extern int def_support(coord, coord, natid, natid); extern int def_support(coord, coord, natid, natid);
extern int oprange(struct empobj *, int, int *); extern int oprange(struct empobj *, int *);
extern int cando(int, int); extern int cando(int, int);
extern void show_mission(int, struct nstr_item *); extern void show_mission(int, struct nstr_item *);
extern int air_defense(coord, coord, natid, struct emp_qelem *, extern int air_defense(coord, coord, natid, struct emp_qelem *,

4
src/lib/commands/miss.c
View file

@ -228,9 +228,9 @@ mission(void)
if ((mission == MI_INTERDICT || mission == MI_SUPPORT || if ((mission == MI_INTERDICT || mission == MI_SUPPORT ||
mission == MI_OSUPPORT || mission == MI_DSUPPORT || mission == MI_OSUPPORT || mission == MI_DSUPPORT ||
mission == MI_AIR_DEFENSE) && mission == MI_AIR_DEFENSE) &&
(oprange(gp, type, &radius) < dist)) { (oprange(gp, &radius) < dist)) {
pr("%s: out of range! (range %d)\n", pr("%s: out of range! (range %d)\n",
nameofitem(gp, type), oprange(gp, type, &radius)); nameofitem(gp, type), oprange(gp, &radius));
continue; continue;
} }

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

@ -326,7 +326,7 @@ build_mission_list_type(struct genlist *mi, coord x, coord y, int mission,
radius = gp->radius; radius = gp->radius;
if (mission != MI_RESERVE) /* XXX */ if (mission != MI_RESERVE) /* XXX */
oprange(gp, type, &radius); oprange(gp, &radius);
if (dist > radius) if (dist > radius)
continue; continue;
@ -335,7 +335,7 @@ build_mission_list_type(struct genlist *mi, coord x, coord y, int mission,
/* Now check from where the object actually is */ /* Now check from where the object actually is */
dist = mapdist(x, y, gp->x, gp->y); dist = mapdist(x, y, gp->x, gp->y);
radius = 999; radius = 999;
oprange(gp, type, &radius); oprange(gp, &radius);
if (dist > radius) if (dist > radius)
continue; continue;
/* Ok, the object can get to where the x,y is */ /* Ok, the object can get to where the x,y is */
@ -864,7 +864,7 @@ show_mission(int type, struct nstr_item *np)
gp->mission == MI_OSUPPORT || gp->mission == MI_OSUPPORT ||
gp->mission == MI_DSUPPORT || gp->mission == MI_AIR_DEFENSE) { gp->mission == MI_DSUPPORT || gp->mission == MI_AIR_DEFENSE) {
radius = 999; radius = 999;
oprange(gp, type, &radius); oprange(gp, &radius);
prxy(" %3d,%-3d", gp->opx, gp->opy, player->cnum); prxy(" %3d,%-3d", gp->opx, gp->opy, player->cnum);
if (radius < gp->radius) if (radius < gp->radius)
pr(" %4d", radius); pr(" %4d", radius);
@ -897,29 +897,25 @@ show_mission(int type, struct nstr_item *np)
} }
int int
oprange(struct empobj *gp, int type, int *radius) oprange(struct empobj *gp, int *radius)
{ {
int range; int range;
struct shpstr ship;
struct lndstr land;
struct plnstr plane;
switch (type) { switch (gp->ef_type) {
case EF_SHIP: case EF_SHIP:
getship(gp->uid, &ship); range = ldround(effrange(((struct shpstr *)gp)->shp_frnge,
range = ldround(effrange(ship.shp_frnge, ship.shp_tech), 1); ((struct shpstr *)gp)->shp_tech), 1);
break; break;
case EF_LAND: case EF_LAND:
getland(gp->uid, &land); range = ldround(effrange(((struct lndstr *)gp)->lnd_frg,
range = ldround(effrange(land.lnd_frg, land.lnd_tech), 1); ((struct lndstr *)gp)->lnd_tech), 1);
break; break;
case EF_PLANE: case EF_PLANE:
getplane(gp->uid, &plane);
/* missiles go one way, so we can use all the range */ /* missiles go one way, so we can use all the range */
if (plchr[(int)plane.pln_type].pl_flags & P_M) if (plchr[(int)gp->type].pl_flags & P_M)
range = plane.pln_range; range = ((struct plnstr *)gp)->pln_range;
else else
range = plane.pln_range / 2; range = ((struct plnstr *)gp)->pln_range / 2;
break; break;
default: default:
CANT_HAPPEN("bad TYPE"); CANT_HAPPEN("bad TYPE");