From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 8 Jan 2013 19:00:09 +0000 (+0100)
Subject: Simplify lnd_take_casualty()'s land unit retreat code
X-Git-Tag: v4.3.31~111
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=d068259487608ba92560357e98ac72f68e2a4306

Simplify lnd_take_casualty()'s land unit retreat code

Bonus: avoids "may be used uninitialized" compiler warnings (the code
was safe despite the warning).
---

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index a65e468f5..fa7243092 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -161,7 +161,6 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
     int n;
     int biggest;
     int civs;
-    int nowned;
     coord ret_x, ret_y;
     coord bx, by;
     struct sctstr sect;
@@ -227,7 +226,6 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
 	     * owner. Charge mob..
 	     */
 	    biggest = -1;
-	    nowned = 0;
 	    for (n = 1; n <= 6; ++n) {
 		ret_x = llp->unit.land.lnd_x + diroff[n][0];
 		ret_y = llp->unit.land.lnd_y + diroff[n][1];
@@ -239,7 +237,6 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
 		mobcost = lnd_mobcost(&llp->unit.land, &sect);
 		if (mobcost < 0)
 		    continue;
-		++nowned;
 		civs = sect.sct_item[I_CIVIL];
 		if (civs > biggest) {
 		    biggest = civs;
@@ -248,7 +245,7 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
 		    bmcost = mobcost;
 		}
 	    }
-	    if (!nowned)
+	    if (biggest < 0)
 		nowhere_to_go = 1;
 	    else {
 		/* retreat to bx,by */