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

(detonate): Change parameters from carrying plane to nuke and

Browse source 
airburst.  Leave taking nuke off the plane to caller.  Use coord for
coordinate parameters.
(pln_damage): Take nuke off the plane.

(detonate): Destroy the nuke.  This is required since arming doesn't
remove nukes from the nuke file anymore (arm.c rev. 1.15).
This commit is contained in:
Markus Armbruster 2006-05-13 14:04:03 +00:00
parent 324e52fa9d
commit 89694cd468
3 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/subs/detonate.c
View file

@ -51,11 +51,10 @@
static void kaboom(int x, int y, int rad, natid cn);
int
detonate(struct plnstr *pp, int x, int y)
detonate(struct nukstr *np, coord x, coord y, int airburst)
{
int nuketype = pp->pln_nuketype;
natid bombown = pp->pln_own;
int airburst = (pp->pln_flags & PLN_AIRBURST);
int nuketype = np->nuk_type;
natid bombown = np->nuk_own;
struct nchrstr *ncp;
struct plnstr plane;
struct sctstr sect;
@ -72,18 +71,19 @@ detonate(struct plnstr *pp, int x, int y)
int rad;
struct nstr_sect ns;
struct nstr_item ni;
int issea = 0;
int issea;
int retval;
pp->pln_nuketype = -1;
getsect(x, y, &sect);
if (sect.sct_type == SCT_WATER)
issea = 1;
issea = sect.sct_type == SCT_WATER;
ncp = &nchr[nuketype];
kaboom(x, y, ncp->n_blast, bombown);
rad = ncp->n_blast;
if (!airburst)
rad = rad * 2 / 3;
np->nuk_effic = 0;
putnuke(np->nuk_uid, np);
snxtsct_dist(&ns, x, y, rad);
while (nxtsct(&ns, &sect)) {
/* Nukes falling on water affect only 1 sector */
@ -146,6 +146,7 @@ detonate(struct plnstr *pp, int x, int y)
mpr(own, "%s nuclear device %s\n", cname(bombown), buf2);
}
}
snxtitem_dist(&ni, EF_PLANE, x, y, rad);
while (nxtitem(&ni, &plane)) {
/* Nukes falling on water affect only 1 sector */
@ -196,6 +197,7 @@ detonate(struct plnstr *pp, int x, int y)
}
putplane(ni.cur, &plane);
}
snxtitem_dist(&ni, EF_LAND, x, y, rad);
while (nxtitem(&ni, &land)) {
/* Nukes falling on water affect only 1 sector */
@ -243,6 +245,7 @@ detonate(struct plnstr *pp, int x, int y)
}
putland(land.lnd_uid, &land);
}
snxtitem_dist(&ni, EF_SHIP, x, y, rad);
while (nxtitem(&ni, &ship)) {
/* Nukes falling on water affect only 1 sector */
@ -284,6 +287,7 @@ detonate(struct plnstr *pp, int x, int y)
}
putship(ship.shp_uid, &ship);
}
snxtitem_dist(&ni, EF_NUKE, x, y, rad);
while (nxtitem(&ni, &nuke)) {
/* Nukes falling on water affect only 1 sector */
@ -310,6 +314,7 @@ detonate(struct plnstr *pp, int x, int y)
}
putnuke(ni.cur, &nuke);
}
return retval;
}

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

@ -1162,6 +1162,7 @@ int
pln_damage(struct plnstr *pp, coord x, coord y, char type, int *nukedamp,
int noisy)
{
struct nukstr nuke;
struct plchrstr *pcp = plchr + pp->pln_type;
int i;
int hitroll;
@ -1171,12 +1172,17 @@ pln_damage(struct plnstr *pp, coord x, coord y, char type, int *nukedamp,
int pinbomber = 0;
if (pp->pln_nuketype != -1) {
mpr(pp->pln_own, "Releasing RV's for %s detonation...\n",
pp->pln_flags & PLN_AIRBURST ? "airburst" : "groundburst");
*nukedamp = detonate(pp, x, y);
return 0;
} else
*nukedamp = 0;
if (nuk_on_plane(&nuke, pp->pln_uid) >= 0) {
mpr(pp->pln_own, "Releasing RV's for %s detonation...\n",
pp->pln_flags & PLN_AIRBURST ? "airburst" : "groundburst");
pp->pln_nuketype = -1;
*nukedamp = detonate(&nuke, x, y,
pp->pln_flags & PLN_AIRBURST);
return 0;
}
CANT_REACH();
}
*nukedamp = 0;
if (!pp->pln_load) /* e.g. ab, blowing up on launch pad */
return 0;