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

(nameofitem, produce, check, fire_dchrg, send_reacting_units_home,

Browse source 
do_map_set, upd_land, nav_check_atdest, produce, upd_ship): Remove
unused parameters.  Callers changed.
This commit is contained in:
Markus Armbruster 2004-03-03 09:39:50 +00:00
parent 19acc1cd07
commit 42290db8c8
12 changed files with 48 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -320,7 +320,7 @@ mission(void)
mission == MI_DSUPPORT || mission == MI_INTERDICT ||
mission == MI_AIR_DEFENSE) {
pr("%s on %s mission, centered on %s, radius %d\n",
nameofitem(buf, gp, type), mission_name(mission),
nameofitem(gp, type), mission_name(mission),
xyas(x, y, player->cnum), gp->radius);
} else if (mission == MI_RESERVE) {
int plus = 2;
@ -336,9 +336,9 @@ mission(void)
}
pr("%s on %s mission with maximum reaction radius %d\n",
nameofitem(buf, gp, type), mission_name(mission), plus);
nameofitem(gp, type), mission_name(mission), plus);
} else if (mission) {
pr("%s on %s mission\n", nameofitem(buf, gp, type),
pr("%s on %s mission\n", nameofitem(gp, type),
mission_name(mission));
}

38
src/lib/commands/repo.c
View file

@ -60,7 +60,7 @@ static void repo_header(void);
static void repo_list(struct stats *stat, natid cn, struct natstr *natp);
static int check(s_char *buf, double theirs, double min, double max,
int shift, int what, int tolerance);
int shift, int tolerance);
int
repo(void)
@ -203,23 +203,23 @@ printdiff(int mystat, double ours, struct natstr *natp, int what)
}
if (tolerance > 2 * ours)
tolerance = (int)(2 * ours);
if (check(buf, theirs, 2 * ours, -1.0, shift, what, tolerance)) ;
else if (check(buf, theirs, 1.5 * ours, 2.0 * ours, shift, what,
tolerance)) ;
else if (check(buf, theirs, 1.2 * ours, 1.5 * ours, shift, what,
tolerance)) ;
else if (check(buf, theirs, 1.1 * ours, 1.2 * ours, shift, what,
tolerance)) ;
else if (check(buf, theirs, ours / 1.1, 1.1 * ours, shift, what,
tolerance)) ;
else if (check(buf, theirs, ours / 1.2, ours / 1.1, shift, what,
tolerance)) ;
else if (check(buf, theirs, ours / 1.5, ours / 1.2, shift, what,
tolerance)) ;
else if (check(buf, theirs, ours / 2.0, ours / 1.5, shift, what,
tolerance)) ;
else if (check(buf, theirs, -1.0, ours / 2.0, shift, what,
tolerance)) ;
if (check(buf, theirs, 2 * ours, -1.0, shift, tolerance))
;
else if (check(buf, theirs, 1.5 * ours, 2.0 * ours, shift, tolerance))
;
else if (check(buf, theirs, 1.2 * ours, 1.5 * ours, shift, tolerance))
;
else if (check(buf, theirs, 1.1 * ours, 1.2 * ours, shift, tolerance))
;
else if (check(buf, theirs, ours / 1.1, 1.1 * ours, shift, tolerance))
;
else if (check(buf, theirs, ours / 1.2, ours / 1.1, shift, tolerance))
;
else if (check(buf, theirs, ours / 1.5, ours / 1.2, shift, tolerance))
;
else if (check(buf, theirs, ours / 2.0, ours / 1.5, shift, tolerance))
;
else if (check(buf, theirs, -1.0, ours / 2.0, shift, tolerance)) ;
else
sprintf(buf, " n/a");
} else
@ -230,7 +230,7 @@ printdiff(int mystat, double ours, struct natstr *natp, int what)
static int
check(s_char *buf, double theirs, double min, double max, int shift,
int what, int tolerance)
int tolerance)
{
double shove;

9
src/lib/commands/torp.c
View file

@ -53,8 +53,7 @@ static void anti_torp(int f, int ntorping, int vshipown);
static int candchrg(struct shpstr *, struct shpstr *);
static int canshoot(struct shpstr *, struct shpstr *);
static int cantorp(struct shpstr *, struct shpstr *);
static void fire_dchrg(struct shpstr *sp, struct shpstr *targ, int range,
int ntargets);
static void fire_dchrg(struct shpstr *sp, struct shpstr *targ, int ntargets);
static int fire_torp(struct shpstr *, struct shpstr *, int, int);
int
@ -282,9 +281,9 @@ anti_torp(int f, int ntorping, int vshipown)
/* Try torping.. if we can, maybe we can fire */
if (!fire_torp(&dd, &sub, range, ntorping))
if (candchrg(&dd, &sub))
fire_dchrg(&dd, &sub, range, ntorping);
fire_dchrg(&dd, &sub, ntorping);
} else
fire_dchrg(&dd, &sub, range, ntorping);
fire_dchrg(&dd, &sub, ntorping);
}
}
@ -343,7 +342,7 @@ candchrg(struct shpstr *a, struct shpstr *b)
}
static void
fire_dchrg(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
fire_dchrg(struct shpstr *sp, struct shpstr *targ, int ntargets)
{
int dam;
int shells;