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

New player_relstr(), factored out out of prunits() and prplanes()

Browse source 
No functional change.
This commit is contained in:
Markus Armbruster 2008-06-14 18:20:48 +02:00
parent 4025c242ff
commit dbd886ae2e
1 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/lib/commands/spy.c
View file

@ -50,9 +50,10 @@
static int check(coord *table, int *len, coord x, coord y); static int check(coord *table, int *len, coord x, coord y);
static void insert(coord *table, int *len, coord x, coord y); static void insert(coord *table, int *len, coord x, coord y);
static int num_units(int, int); static int num_units(int, int);
static void spy_report(struct sctstr *sp);
static void prplanes(int, int); static void prplanes(int, int);
static void prunits(int, int); static void prunits(int, int);
static void spy_report(struct sctstr *sp); static char *player_relstr(natid);
int int
spy(void) spy(void)
@ -287,18 +288,9 @@ prunits(int x, int y)
continue; continue;
} }
if ((land.lnd_own != player->cnum) && land.lnd_own) { if ((land.lnd_own != player->cnum) && land.lnd_own) {
int rel;
char *relstr;
rel = getrel(getnatp(player->cnum), land.lnd_own);
if (rel == ALLIED)
relstr = "Allied";
else if (rel == FRIENDLY || rel == NEUTRAL)
relstr = "Neutral";
else
relstr = "Enemy";
sprintf(report, "%s (%s) unit in %s: ", sprintf(report, "%s (%s) unit in %s: ",
relstr, cname(land.lnd_own), player_relstr(land.lnd_own),
cname(land.lnd_own),
xyas(land.lnd_x, land.lnd_y, player->cnum)); xyas(land.lnd_x, land.lnd_y, player->cnum));
intelligence_report(player->cnum, &land, 3, report); intelligence_report(player->cnum, &land, 3, report);
} }
@ -320,20 +312,23 @@ prplanes(int x, int y)
if (plane.pln_flags & PLN_LAUNCHED) if (plane.pln_flags & PLN_LAUNCHED)
continue; continue;
if ((plane.pln_own != player->cnum) && plane.pln_own) { if ((plane.pln_own != player->cnum) && plane.pln_own) {
int rel;
char *relstr;
rel = getrel(getnatp(player->cnum), plane.pln_own);
if (rel == ALLIED)
relstr = "Allied";
else if (rel == FRIENDLY || rel == NEUTRAL)
relstr = "Neutral";
else
relstr = "Enemy";
pr("%s (%s) plane in %s: %s\n", pr("%s (%s) plane in %s: %s\n",
relstr, cname(plane.pln_own), player_relstr(plane.pln_own),
cname(plane.pln_own),
xyas(plane.pln_x, plane.pln_y, player->cnum), xyas(plane.pln_x, plane.pln_y, player->cnum),
prplane(&plane)); prplane(&plane));
} }
} }
} }
static char *
player_relstr(natid them)
{
int rel = getrel(getnatp(player->cnum), them);
if (rel == ALLIED)
return "Allied";
if (rel >= NEUTRAL)
return "Neutral";
return "Enemy";
}