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

Remove oprange()'s mission parameter

Browse source 
Use the current mission instead.  Make mission() set it before calling
oprange(), and clean up somewhat.
This commit is contained in:
Markus Armbruster 2008-12-14 14:05:40 -05:00
parent ca9af92523
commit d5f371cc1d
3 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -741,14 +741,20 @@ mission_name(short mission)
return "a mysterious";
}
/*
* Maximum distance GP can perform its mission.
* Note: this has nothing to do with the radius of the op-area.
* oprange() governs where the unit *can* strike, the op-area governs
* where the player wants it to strike.
*/
int
oprange(struct empobj *gp, int mission)
oprange(struct empobj *gp)
{
switch (gp->ef_type) {
case EF_SHIP:
return ldround(shp_fire_range((struct shpstr *)gp), 1);
case EF_LAND:
if (mission == MI_RESERVE)
if (gp->mission == MI_RESERVE)
return lnd_reaction_range((struct lndstr *)gp);
return ldround(lnd_fire_range((struct lndstr *)gp), 1);
case EF_PLANE:
@ -768,7 +774,7 @@ int
in_oparea(struct empobj *gp, coord x, coord y)
{
return mapdist(x, y, gp->opx, gp->opy) <= gp->radius
&& mapdist(x, y, gp->x, gp->y) <= oprange(gp, gp->mission);
&& mapdist(x, y, gp->x, gp->y) <= oprange(gp);
}
/*