From b49bfd7814e298d437a223ba2516839a99c47232 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 26 Mar 2006 13:55:29 +0000
Subject: [PATCH] (unit_interdict, knockdown): Simplify.  No functional change.

---
 src/lib/common/bridgefall.c | 12 ++++--------
 src/lib/subs/mission.c      | 14 +++-----------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/lib/common/bridgefall.c b/src/lib/common/bridgefall.c
index e321cba9..be9a7bce 100644
--- a/src/lib/common/bridgefall.c
+++ b/src/lib/common/bridgefall.c
@@ -101,14 +101,10 @@ knockdown(struct sctstr *sp, struct emp_qelem *list)
     struct nstr_item ni;
     struct natstr *np;
 
-    if (sp->sct_type == SCT_BTOWER)
-	mpr(sp->sct_own,
-	    "Crumble... SCREEEECH!  Splash! Bridge tower falls at %s!\n",
-	    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));
+    mpr(sp->sct_own,
+	"Crumble... SCREEEECH!  Splash! Bridge%s falls at %s!\n",
+	sp->sct_type == SCT_BTOWER ? " tower" : "",
+	xyas(sp->sct_x, sp->sct_y, sp->sct_own));
     sp->sct_type = SCT_WATER;
     sp->sct_newtype = SCT_WATER;
     makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index a6d912aa..60ead607 100644
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -197,15 +197,8 @@ unit_interdict(coord x, coord y, natid victim, s_char *s, int hardtarget,
 	if (newdam) {
 	    /* If only subs responded, then we don't know who's
 	       subs they are */
-	    if (osubs) {
-		mpr(victim,
-		    "Enemy interdiction mission does %d damage!\n",
-		    newdam);
-	    } else {
-		mpr(victim,
-		    "%s interdiction mission does %d damage!\n",
-		    cname(cn), newdam);
-	    }
+	    mpr(victim, "%s interdiction mission does %d damage!\n",
+		osubs ? "Enemy" : cname(cn), newdam);
 	}
     }
     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",
 		    xyas(x, y, victim));
 	    } else if (*s == 's') {
-		mpr(victim,
-		    "SPLASH!  Bombs miss your %s in %s\n",
+		mpr(victim, "SPLASH!  Bombs miss your %s in %s\n",
 		    s, xyas(x, y, victim));
 	    } else {
 		mpr(victim, "SPLAT!  Bombs miss your %s in %s\n",