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

Let spy report on unoccupied sectors

Browse source 
Make spy() not skip sectors without civilians, military and land
units.  There could be other interesting things to report there:
efficiency, gold bars, planes...
This commit is contained in:
Markus Armbruster 2008-06-14 19:13:30 +02:00
parent a233ecfea9
commit ab2b930b5b
1 changed files with 1 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,6 @@
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 void spy_report(struct sctstr *sp); 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);
@ -137,14 +136,8 @@ spy(void)
continue; continue;
} }
getsect(nx, ny, &dsect); getsect(nx, ny, &dsect);
if (player->owner if (player->owner || dsect.sct_type == SCT_WATER)
|| (dsect.sct_type == SCT_WATER)
|| (!dsect.sct_item[I_MILIT] && !dsect.sct_item[I_CIVIL]
&& num_units(nx, ny) == 0)) {
/* mark sector as seen */
insert(table, &t_len, nx, ny);
continue; continue;
}
own = dsect.sct_own; own = dsect.sct_own;
relat = getrel(getnatp(own), player->cnum); relat = getrel(getnatp(own), player->cnum);
@ -248,25 +241,6 @@ check(coord *table, int *len, coord x, coord y)
return 0; return 0;
} }
static int
num_units(int x, int y)
{
struct lndstr land;
struct nstr_item ni;
int n = 0;
snxtitem_xy(&ni, EF_LAND, x, y);
while (nxtitem(&ni, &land)) {
if ((land.lnd_own == player->cnum) || (land.lnd_own == 0))
continue;
if (land.lnd_ship >= 0 || land.lnd_land >= 0)
continue;
n++;
}
return n;
}
static void static void
prunits(int x, int y) prunits(int x, int y)
{ {