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

Move code from def_support(), off_support() to dosupport()

Browse source
This commit is contained in:
Markus Armbruster 2011-01-31 20:02:23 +01:00
parent 723cc96d9c
commit 6a35432346
1 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,7 @@ static void build_mission_list(struct genlist *, coord, coord, int, natid);
static void build_mission_list_type(struct genlist *, coord, coord, int, static void build_mission_list_type(struct genlist *, coord, coord, int,
int, natid); int, natid);
static void divide(struct emp_qelem *, struct emp_qelem *, coord, coord); static void divide(struct emp_qelem *, struct emp_qelem *, coord, coord);
static int dosupport(struct genlist *, coord, coord, natid, natid); static int dosupport(coord, coord, natid, natid, int);
static int find_airport(struct emp_qelem *, coord, coord); static int find_airport(struct emp_qelem *, coord, coord);
static void mission_pln_arm(struct emp_qelem *, coord, coord, int, static void mission_pln_arm(struct emp_qelem *, coord, coord, int,
int, struct ichrstr *); int, struct ichrstr *);
@ -218,19 +218,7 @@ unit_interdict(coord x, coord y, natid victim, char *s, int hardtarget,
int int
off_support(coord x, coord y, natid victim, natid actee) off_support(coord x, coord y, natid victim, natid actee)
{ {
int dam = 0; return dosupport(x, y, victim, actee, MI_OSUPPORT);
struct genlist mi[MAXNOC];
int cn;
memset(mi, 0, sizeof(mi));
for (cn = 1; cn < MAXNOC; cn++)
emp_initque((struct emp_qelem *)&mi[cn]);
build_mission_list(mi, x, y, MI_SUPPORT, victim);
build_mission_list(mi, x, y, MI_OSUPPORT, victim);
dam = dosupport(mi, x, y, victim, actee);
return dam;
} }
/* /*
@ -239,27 +227,23 @@ off_support(coord x, coord y, natid victim, natid actee)
int int
def_support(coord x, coord y, natid victim, natid actee) def_support(coord x, coord y, natid victim, natid actee)
{ {
int dam = 0; return dosupport(x, y, victim, actee, MI_DSUPPORT);
struct genlist mi[MAXNOC]; }
static int
dosupport(coord x, coord y, natid victim, natid actee, int mission)
{
int cn; int cn;
struct genlist mi[MAXNOC];
int rel, newdam;
int dam = 0;
memset(mi, 0, sizeof(mi)); memset(mi, 0, sizeof(mi));
for (cn = 1; cn < MAXNOC; cn++) for (cn = 1; cn < MAXNOC; cn++)
emp_initque((struct emp_qelem *)&mi[cn]); emp_initque((struct emp_qelem *)&mi[cn]);
build_mission_list(mi, x, y, MI_SUPPORT, victim); build_mission_list(mi, x, y, MI_SUPPORT, victim);
build_mission_list(mi, x, y, MI_DSUPPORT, victim); build_mission_list(mi, x, y, mission, victim);
dam = dosupport(mi, x, y, victim, actee);
return dam;
}
static int
dosupport(struct genlist *mi, coord x, coord y, natid victim, natid actee)
{
int cn;
int rel, newdam;
int dam = 0;
for (cn = 1; cn < MAXNOC; cn++) { for (cn = 1; cn < MAXNOC; cn++) {
rel = getrel(getnatp(cn), actee); rel = getrel(getnatp(cn), actee);