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

(notify_coastguard): Failed to make contact when NF_COASTWATCH was

Browse source 
off.
This commit is contained in:
Markus Armbruster 2005-10-03 14:47:59 +00:00
parent 61d1afdde9
commit e36134038a
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/lib/subs/shpsub.c
View file

@ -591,22 +591,17 @@ notify_coastguard(struct emp_qelem *list, int trange, struct sctstr *sectp)
if (vrange < trange) if (vrange < trange)
return 0; return 0;
/* We got here, so we could theoretically see the ship. Now,
* do we want to see it in our telebox? If not, return positive
* since we could see the ship and want forts to fire. */
if (!(natp->nat_flags & NF_COASTWATCH))
return 1;
for (qp = list->q_back; qp != list; qp = next) { for (qp = list->q_back; qp != list; qp = next) {
next = qp->q_back; next = qp->q_back;
mlp = (struct mlist *)qp; mlp = (struct mlist *)qp;
if (mlp->mcp->m_flags & M_SUB) if (mlp->mcp->m_flags & M_SUB)
continue; continue;
wu(0, sectp->sct_own, if (natp->nat_flags & NF_COASTWATCH)
"%s %s sighted at %s\n", wu(0, sectp->sct_own,
cname(mlp->ship.shp_own), "%s %s sighted at %s\n",
prship(&mlp->ship), cname(mlp->ship.shp_own),
xyas(mlp->ship.shp_x, mlp->ship.shp_y, sectp->sct_own)); prship(&mlp->ship),
xyas(mlp->ship.shp_x, mlp->ship.shp_y, sectp->sct_own));
if (opt_HIDDEN) if (opt_HIDDEN)
setcont(sectp->sct_own, mlp->ship.shp_own, FOUND_COAST); setcont(sectp->sct_own, mlp->ship.shp_own, FOUND_COAST);
} }