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

Have the complete spy report code in one place

Browse source 
Move prunits() and prplanes() from spyline()'s caller into spyline().
Rename spyline() to spy_report().  No functional change.
This commit is contained in:
Markus Armbruster 2008-06-14 18:07:01 +02:00
parent 89e33f6218
commit 4025c242ff
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ 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 prplanes(int, int); static void prplanes(int, int);
static void prunits(int, int); static void prunits(int, int);
static void spyline(struct sctstr *sp); static void spy_report(struct sctstr *sp);
int int
spy(void) spy(void)
@ -176,11 +176,9 @@ spy(void)
/* spy report */ /* spy report */
insert(table, &t_len, nx, ny); insert(table, &t_len, nx, ny);
spyline(&dsect); spy_report(&dsect);
changed += map_set(player->cnum, dsect.sct_x, dsect.sct_y, changed += map_set(player->cnum, dsect.sct_x, dsect.sct_y,
dchr[dsect.sct_type].d_mnem, 0); dchr[dsect.sct_type].d_mnem, 0);
prunits(dsect.sct_x, dsect.sct_y);
prplanes(dsect.sct_x, dsect.sct_y);
if (opt_HIDDEN) if (opt_HIDDEN)
setcont(player->cnum, own, FOUND_SPY); setcont(player->cnum, own, FOUND_SPY);
} }
@ -199,12 +197,8 @@ spy(void)
return RET_OK; return RET_OK;
} }
/*
* just a big printf.
*/
static void static void
spyline(struct sctstr *sp) spy_report(struct sctstr *sp)
{ {
prxy("%4d,%-4d", sp->sct_x, sp->sct_y, player->cnum); prxy("%4d,%-4d", sp->sct_x, sp->sct_y, player->cnum);
pr(" %c%c %3d %3d %3d %3d %3d %3d %4d %4d %4d %3d %4d %4d %4d %3d %3d\n", pr(" %c%c %3d %3d %3d %3d %3d %3d %4d %4d %4d %3d %4d %4d %4d %3d %3d\n",
@ -225,9 +219,10 @@ spyline(struct sctstr *sp)
roundintby(sp->sct_item[I_BAR], 10), roundintby(sp->sct_item[I_BAR], 10),
count_sect_units(sp), count_sect_units(sp),
count_sect_planes(sp)); count_sect_planes(sp));
prunits(sp->sct_x, sp->sct_y);
prplanes(sp->sct_x, sp->sct_y);
} }
/* /*
* insert a key into the table. * insert a key into the table.
*/ */