From b3fc6413e05fb3f6b8a3a40026326e91656fcef6 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 15 Jun 2006 21:19:03 +0000 Subject: [PATCH] (sector_strength): Back out rev. 1.53's oopses, because their conditions can happen. --- src/lib/subs/attsub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index edfea19d..d1a78987 100644 --- a/src/lib/subs/attsub.c +++ b/src/lib/subs/attsub.c @@ -2582,9 +2582,9 @@ sector_strength(struct sctstr *sp) double base = sp->sct_type == SCT_MOUNT ? 2.0 : 1.0; double d = base + (dchr[sp->sct_type].d_dstr - base) * def; - if (CANT_HAPPEN(d > dchr[sp->sct_type].d_dstr)) + if (d > dchr[sp->sct_type].d_dstr) d = dchr[sp->sct_type].d_dstr; - if (CANT_HAPPEN(d < base)) + if (d < base) d = base; return d; }