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

(knockdown): Destroy nukes on collapsing bridges. Before, you could

Browse source 
rescue them by building a new bridge or arming them on naval planes.
This commit is contained in:
Markus Armbruster 2006-05-13 07:24:10 +00:00
parent 75363a0525
commit 75e35f932f
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/lib/common/bridgefall.c
View file

@ -98,6 +98,7 @@ knockdown(struct sctstr *sp, struct emp_qelem *list)
{ {
struct lndstr land; struct lndstr land;
struct plnstr plane; struct plnstr plane;
struct nukstr nuke;
struct nstr_item ni; struct nstr_item ni;
struct natstr *np; struct natstr *np;
@ -118,8 +119,6 @@ knockdown(struct sctstr *sp, struct emp_qelem *list)
while (nxtitem(&ni, &land)) { while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0) if (land.lnd_own == 0)
continue; continue;
if (land.lnd_x != sp->sct_x || land.lnd_y != sp->sct_y)
continue;
if (land.lnd_ship >= 0) if (land.lnd_ship >= 0)
continue; continue;
np = getnatp(land.lnd_own); np = getnatp(land.lnd_own);
@ -138,8 +137,6 @@ knockdown(struct sctstr *sp, struct emp_qelem *list)
while (nxtitem(&ni, &plane)) { while (nxtitem(&ni, &plane)) {
if (plane.pln_own == 0) if (plane.pln_own == 0)
continue; continue;
if (plane.pln_x != sp->sct_x || plane.pln_y != sp->sct_y)
continue;
if (plane.pln_flags & PLN_LAUNCHED) if (plane.pln_flags & PLN_LAUNCHED)
continue; continue;
if (plane.pln_ship >= 0) if (plane.pln_ship >= 0)
@ -158,6 +155,24 @@ knockdown(struct sctstr *sp, struct emp_qelem *list)
plane.pln_effic = 0; plane.pln_effic = 0;
putplane(plane.pln_uid, &plane); putplane(plane.pln_uid, &plane);
} }
/* Sink all the nukes */
snxtitem_xy(&ni, EF_NUKE, sp->sct_x, sp->sct_y);
while (nxtitem(&ni, &nuke)) {
if (nuke.nuk_own == 0)
continue;
if (nuke.nuk_plane >= 0)
continue;
np = getnatp(nuke.nuk_own);
if (np->nat_flags & NF_BEEP)
mpr(nuke.nuk_own, "\07");
mpr(nuke.nuk_own, " %s sinks to the bottom of the sea!\n",
prnuke(&nuke));
makelost(EF_NUKE, nuke.nuk_own, nuke.nuk_uid, nuke.nuk_x,
nuke.nuk_y);
nuke.nuk_own = 0;
nuke.nuk_effic = 0;
putnuke(nuke.nuk_uid, &nuke);
}
memset(sp->sct_item, 0, sizeof(sp->sct_item)); memset(sp->sct_item, 0, sizeof(sp->sct_item));
memset(sp->sct_del, 0, sizeof(sp->sct_del)); memset(sp->sct_del, 0, sizeof(sp->sct_del));
memset(sp->sct_dist, 0, sizeof(sp->sct_dist)); memset(sp->sct_dist, 0, sizeof(sp->sct_dist));