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

(s_commod): Move initialization of `min' before first use.

Browse source 
(itemname): Unused, remove.
This commit is contained in:
Markus Armbruster 2004-03-01 14:23:44 +00:00
parent f72281b773
commit 95b650396a
1 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/lib/subs/supply.c
View file

@ -50,7 +50,6 @@
#include "prototypes.h" #include "prototypes.h"
static int get_minimum(struct lndstr *, int); static int get_minimum(struct lndstr *, int);
static s_char *itemname(int);
static int s_commod(int, int, int, int, int, int); static int s_commod(int, int, int, int, int, int);
/* /*
@ -410,6 +409,7 @@ s_commod(int own, int x, int y, int type, int total_wanted,
} }
getvec(VT_ITEM, vec, (s_char *)&land, EF_LAND); getvec(VT_ITEM, vec, (s_char *)&land, EF_LAND);
min = get_minimum(&land, type);
ip = &ichr[type]; ip = &ichr[type];
weight = ((double)ip->i_lbs); weight = ((double)ip->i_lbs);
mobcost = move_cost * weight; mobcost = move_cost * weight;
@ -417,7 +417,6 @@ s_commod(int own, int x, int y, int type, int total_wanted,
can_move = ((double)land.lnd_mobil / mobcost); can_move = ((double)land.lnd_mobil / mobcost);
else else
can_move = vec[type] - min; can_move = vec[type] - min;
min = get_minimum(&land, type);
if (can_move > (vec[type] - min)) if (can_move > (vec[type] - min))
can_move = (vec[type] - min); can_move = (vec[type] - min);
@ -454,20 +453,6 @@ s_commod(int own, int x, int y, int type, int total_wanted,
} }
static s_char *
itemname(int type)
{
register int t;
register struct ichrstr *ip;
t = V_ITEM(type);
for (ip = &ichr[1]; ip->i_mnem != 0; ip++) {
if (t == ip->i_vtype)
return ip->i_name;
}
return 0;
}
/* /*
* We want to get enough shells to fire once, * We want to get enough shells to fire once,
* one update's worth of food, enough fuel for * one update's worth of food, enough fuel for