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

(unit_interdict, knockdown): Simplify. No functional change.

Browse source
This commit is contained in:
Markus Armbruster 2006-03-26 13:55:29 +00:00
parent 4c6fb12377
commit b49bfd7814
2 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,14 +101,10 @@ knockdown(struct sctstr *sp, struct emp_qelem *list)
struct nstr_item ni; struct nstr_item ni;
struct natstr *np; struct natstr *np;
if (sp->sct_type == SCT_BTOWER) mpr(sp->sct_own,
mpr(sp->sct_own, "Crumble... SCREEEECH! Splash! Bridge%s falls at %s!\n",
"Crumble... SCREEEECH! Splash! Bridge tower falls at %s!\n", sp->sct_type == SCT_BTOWER ? " tower" : "",
xyas(sp->sct_x, sp->sct_y, sp->sct_own)); xyas(sp->sct_x, sp->sct_y, sp->sct_own));
else
mpr(sp->sct_own,
"Crumble... SCREEEECH! Splash! Bridge falls at %s!\n",
xyas(sp->sct_x, sp->sct_y, sp->sct_own));
sp->sct_type = SCT_WATER; sp->sct_type = SCT_WATER;
sp->sct_newtype = SCT_WATER; sp->sct_newtype = SCT_WATER;
makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y); makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);

14
src/lib/subs/mission.c
View file

@ -197,15 +197,8 @@ unit_interdict(coord x, coord y, natid victim, s_char *s, int hardtarget,
if (newdam) { if (newdam) {
/* If only subs responded, then we don't know who's /* If only subs responded, then we don't know who's
subs they are */ subs they are */
if (osubs) { mpr(victim, "%s interdiction mission does %d damage!\n",
mpr(victim, osubs ? "Enemy" : cname(cn), newdam);
"Enemy interdiction mission does %d damage!\n",
newdam);
} else {
mpr(victim,
"%s interdiction mission does %d damage!\n",
cname(cn), newdam);
}
} }
} }
if (dam) { if (dam) {
@ -1458,8 +1451,7 @@ air_damage(struct emp_qelem *bombers, coord x, coord y, int mission,
"RUMBLE... your sub in %s hears a depth-charge explode nearby\n", "RUMBLE... your sub in %s hears a depth-charge explode nearby\n",
xyas(x, y, victim)); xyas(x, y, victim));
} else if (*s == 's') { } else if (*s == 's') {
mpr(victim, mpr(victim, "SPLASH! Bombs miss your %s in %s\n",
"SPLASH! Bombs miss your %s in %s\n",
s, xyas(x, y, victim)); s, xyas(x, y, victim));
} else { } else {
mpr(victim, "SPLAT! Bombs miss your %s in %s\n", mpr(victim, "SPLAT! Bombs miss your %s in %s\n",