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

Don't beep when plane, land unit or nuke die on collapsing bridge

Browse source 
Not nice, because it could beep many times, and could put beeps in
bulletins.  Moreover, it misused mpr() and thus put the beep in its
own bulletin.  The read command normally merges this bulletin with the
adjacent ones, but if the bulletins are more than five seconds apart
(clock jumped somehow), we can get an empty bulletin just for the
beep.

Beeping was added in v4.0.18.
This commit is contained in:
Markus Armbruster 2010-06-06 22:26:02 +02:00
parent 2d436e7830
commit aa3c5ef350
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/subs/bridgefall.c
View file

@ -122,7 +122,6 @@ knockdown(struct sctstr *sp)
struct plnstr plane; struct plnstr plane;
struct nukstr nuke; struct nukstr nuke;
struct nstr_item ni; struct nstr_item ni;
struct natstr *np;
mpr(sp->sct_own, mpr(sp->sct_own,
"Crumble... SCREEEECH! Splash! Bridge%s falls at %s!\n", "Crumble... SCREEEECH! Splash! Bridge%s falls at %s!\n",
@ -144,9 +143,6 @@ knockdown(struct sctstr *sp)
continue; continue;
if (land.lnd_ship >= 0) if (land.lnd_ship >= 0)
continue; continue;
np = getnatp(land.lnd_own);
if (np->nat_flags & NF_BEEP)
mpr(land.lnd_own, "\07");
mpr(land.lnd_own, " AARGH! %s tumbles to its doom!\n", mpr(land.lnd_own, " AARGH! %s tumbles to its doom!\n",
prland(&land)); prland(&land));
land.lnd_effic = 0; land.lnd_effic = 0;
@ -161,9 +157,6 @@ knockdown(struct sctstr *sp)
continue; continue;
if (plane.pln_ship >= 0) if (plane.pln_ship >= 0)
continue; continue;
np = getnatp(plane.pln_own);
if (np->nat_flags & NF_BEEP)
mpr(plane.pln_own, "\07");
mpr(plane.pln_own, " AARGH! %s tumbles to its doom!\n", mpr(plane.pln_own, " AARGH! %s tumbles to its doom!\n",
prplane(&plane)); prplane(&plane));
plane.pln_effic = 0; plane.pln_effic = 0;
@ -176,9 +169,6 @@ knockdown(struct sctstr *sp)
continue; continue;
if (nuke.nuk_plane >= 0) if (nuke.nuk_plane >= 0)
continue; 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", mpr(nuke.nuk_own, " %s sinks to the bottom of the sea!\n",
prnuke(&nuke)); prnuke(&nuke));
nuke.nuk_effic = 0; nuke.nuk_effic = 0;