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

(as_extend, as_costcomp, gen_power, powcmp): Fix non-portable function

Browse source 
cast.
(qsort_func_t): Unused, remove.
This commit is contained in:
Markus Armbruster 2005-02-24 18:47:26 +00:00
parent b360d076d3
commit 0aaf0084aa
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/commands/powe.c
View file

@ -60,7 +60,7 @@ struct powsort {
static void addtopow(short *vec, struct powstr *pow);
static void gen_power(void);
static void out5(double value, int round_val, int round_flag);
static int powcmp(struct powsort *p1, struct powsort *p2);
static int powcmp(const void *, const void *);
static int set_target(s_char *, int *);
int
@ -325,19 +325,16 @@ gen_power(void)
for (i = 1; i < MAXNOC; i++) {
struct natstr *np;
int maxpop;
float f = 1.0;
if (opt_RES_POP) {
np = getnatp(i);
maxpop = max_population(np->nat_level[NAT_RLEV], SCT_MINE, 0);
f = 1.0 + (((float)maxpop) / 10000.0);
powbuf[i].p_power *= 1.0 + maxpop / 10000.0;
}
powbuf[i].p_power *= f;
order[i].powval = powbuf[i].p_power;
order[i].cnum = i;
}
qsort((s_char *)&order[1], MAXNOC - 1, sizeof(*order),
(qsort_func_t)powcmp);
qsort(&order[1], MAXNOC - 1, sizeof(*order), powcmp);
putpower(0, &powbuf[0]);
for (i = 1; i < MAXNOC; i++) {
putpower(i, &powbuf[order[i].cnum]);
@ -353,8 +350,11 @@ gen_power(void)
}
static int
powcmp(struct powsort *p1, struct powsort *p2)
powcmp(const void *a, const void *b)
{
const struct powsort *p1 = a;
const struct powsort *p2 = b;
if (p1->powval > p2->powval)
return -1;
if (p1->powval < p2->powval)