From 7fa0334c25c9c8c2a111d42ed37421b0a5e61f62 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 28 Dec 2014 19:06:16 +0100 Subject: [PATCH] subs: Don't hardcode impassable sector types Check for d_mob0 < 0 instead, like we do elsewhere. Signed-off-by: Markus Armbruster --- src/lib/subs/lndsub.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c index 793de53f..80d15519 100644 --- a/src/lib/subs/lndsub.c +++ b/src/lib/subs/lndsub.c @@ -975,11 +975,9 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor, newy = ynorm(llp->unit.land.lnd_y + dy); getsect(newx, newy, §); rel = relations_with(sect.sct_own, actor); - if ((rel != ALLIED && - !(lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY) && - sect.sct_own) || (sect.sct_type == SCT_WATER || - sect.sct_type == SCT_SANCT || - sect.sct_type == SCT_WASTE)) { + if ((rel != ALLIED && sect.sct_own + && !(lchr[llp->unit.land.lnd_type].l_flags & L_SPY)) + || dchr[sect.sct_type].d_mob0 < 0) { if (together) { mpr(actor, "can't go to %s\n", xyas(newx, newy, actor)); return 1;