From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 29 Mar 2009 15:48:06 +0000 (+0200)
Subject: Simplify build_tower() a bit
X-Git-Tag: v4.3.22~36
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=2adb88202fe8e6f1fc9350b6b35eab29a009c8eb

Simplify build_tower() a bit

No functional change.
---

diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index 83f875965..8e298e36c 100644
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -769,7 +769,6 @@ build_tower(struct sctstr *sp, short *vec)
     int avail;
     char *p;
     char buf[1024];
-    int good;
     int i;
     int nx;
     int ny;
@@ -828,7 +827,6 @@ build_tower(struct sctstr *sp, short *vec)
 
     /* Now, check.  You aren't allowed to build bridge towers
        next to land. */
-    good = 0;
     for (i = 1; i <= 6; i++) {
 	struct sctstr s2;
 	nx = sect.sct_x + diroff[i][0];
@@ -836,15 +834,11 @@ build_tower(struct sctstr *sp, short *vec)
 	getsect(nx, ny, &s2);
 	if ((s2.sct_type != SCT_WATER) &&
 	    (s2.sct_type != SCT_BTOWER) && (s2.sct_type != SCT_BSPAN)) {
-	    good = 1;
-	    break;
+	    pr("Bridge towers cannot be built adjacent to land.\n");
+	    pr("That sector is adjacent to land.\n");
+	    return 0;
 	}
     }
-    if (good) {
-	pr("Bridge towers cannot be built adjacent to land.\n");
-	pr("That sector is adjacent to land.\n");
-	return 0;
-    }
 
     sp->sct_avail -= avail;
     player->dolcost += buil_tower_bc;