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

Make skywatch report satellite uid

Browse source 
The uid is required for launching a-sats since commit 1ee02875,
v4.3.23.

Change output to resemble coastwatch's.
This commit is contained in:
Markus Armbruster 2010-04-02 20:02:39 +02:00
parent e99ba304a5
commit 38befcb446
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/commands/skyw.c
View file

@ -87,7 +87,7 @@ skyw(void)
/* get that last one! */ /* get that last one! */
free(skyp); free(skyp);
pr("- = [ Skywatch report for %s ] = -\n", cname(player->cnum)); pr("- = [ Skywatch report for %s ] = -\n", cname(player->cnum));
pr(" %18s%20s %s\n", "Country", "Satellite", "Location"); pr(" Country Satellite Location\n");
tech = tfact(player->cnum, 1.0); tech = tfact(player->cnum, 1.0);
while (nxtsct(&nstr, &sect) && nsat) { while (nxtsct(&nstr, &sect) && nsat) {
if (sect.sct_own != player->cnum) if (sect.sct_own != player->cnum)
@ -134,7 +134,6 @@ showsat(struct sky **skypp, int x, int y)
struct sky *todelete = NULL; struct sky *todelete = NULL;
struct sky **prev; struct sky **prev;
struct plchrstr *pcp; struct plchrstr *pcp;
char *name;
int nsat = 0; int nsat = 0;
prev = NULL; prev = NULL;
@ -151,10 +150,9 @@ showsat(struct sky **skypp, int x, int y)
continue; continue;
} }
pcp = &plchr[(int)skyp->s_sat.pln_type]; pcp = &plchr[(int)skyp->s_sat.pln_type];
name = pcp->pl_name; pr(" %12.12s (#%3d) %s @ %s\n",
pr(" %12.12s (#%d) %20s %s\n",
cname(skyp->s_sat.pln_own), skyp->s_sat.pln_own, cname(skyp->s_sat.pln_own), skyp->s_sat.pln_own,
name, xyas(x, y, player->cnum)); prplane(&skyp->s_sat), xyas(x, y, player->cnum));
if (opt_HIDDEN) { if (opt_HIDDEN) {
/* FOUND_COAST should probably be changed to FOUND_SKY -KHS */ /* FOUND_COAST should probably be changed to FOUND_SKY -KHS */
setcont(player->cnum, skyp->s_sat.pln_own, FOUND_COAST); setcont(player->cnum, skyp->s_sat.pln_own, FOUND_COAST);