From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 16 Jul 2011 09:38:50 +0000 (+0200)
Subject: Fix "sector can board" test to ignore land units on land units
X-Git-Tag: v4.3.28~4
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=0a693c1fa205c8358b4a35d5f9f367eb76bc945d

Fix "sector can board" test to ignore land units on land units

boar() lets a sector board if it has mobility or usable land units.
Embarked land units are not usable.  But it tests only "on ship", not
"on land unit".  Broken in 4.0.17.
---

diff --git a/src/lib/commands/boar.c b/src/lib/commands/boar.c
index b153153a6..c0dfafeca 100644
--- a/src/lib/commands/boar.c
+++ b/src/lib/commands/boar.c
@@ -90,7 +90,7 @@ boar(void)
 	    while (nxtitem(&ni, &land)) {
 		if (land.lnd_own != player->cnum)
 		    continue;
-		if (land.lnd_ship >= 0)
+		if (land.lnd_ship >= 0 || land.lnd_land >= 0)
 		    continue;
 		if (land.lnd_mobil <= 0)
 		    continue;