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

(get_assembly_point): Close loophole that allowed players to find all

Browse source 
unowned sectors.  The assembly point must now be owned or allied, or
have an owned or allied ship.

Info pages didn't match the old rule.  Fix them to match the new rule.
This commit is contained in:
Markus Armbruster 2005-10-04 07:20:37 +00:00
parent 5a7670d9be
commit af32304af0
7 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/lib/subs/plnsub.c
View file

@ -64,18 +64,32 @@ get_assembly_point(char *input, struct sctstr *ap_sect, char *buf)
{
char *p;
coord x, y;
struct nstr_item ni;
struct shpstr ship;
p = getstarg(input, "assembly point? ", buf);
if (!p || *p == 0)
return NULL;
if (!sarg_xy(p, &x, &y) || !getsect(x, y, ap_sect))
return NULL;
if (ap_sect->sct_own && ap_sect->sct_own != player->cnum &&
getrel(getnatp(ap_sect->sct_own), player->cnum) != ALLIED) {
pr("Assembly point not owned by you or an ally!\n");
return NULL;
/* over own or allied sector is fine */
if (ap_sect->sct_own == player->cnum
|| getrel(getnatp(ap_sect->sct_own), player->cnum) == ALLIED)
return ap_sect;
/* over own or allied ship is fine */
snxtitem_xy(&ni, EF_SHIP, x, y);
while (nxtitem(&ni, &ship)) {
if (ship.shp_effic < SHIP_MINEFF || ship.shp_own == 0)
continue;
if (ship.shp_own == player->cnum
|| getrel(getnatp(ship.shp_own), player->cnum) == ALLIED)
return ap_sect;
}
return ap_sect;
pr("Assembly point not owned by you or an ally!\n");
return NULL;
}
int