From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Apr 2022 15:17:43 +0000 (+0100)
Subject: ilks: Make ilk available earlier in passive calculation
X-Git-Tag: otter-1.1.0~509
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bc70a63a100661599d86a89d29d1c1910629a17a;p=otter.git

ilks: Make ilk available earlier in passive calculation

The only functional effect is that some broken states now no longer
get occultated.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/hidden.rs b/src/hidden.rs
index 8dd0f8c6..0713789a 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -696,10 +696,10 @@ fn recalculate_occultation_general<
       if let Some(occid) = occulteds.new;
       let zg = gen.next();
       let occ = occultation(goccults, occid);
+      if let Some(ilk) = wants!( ipc.occilk.as_ref() );
       then {
         if_chain!{
           if occ.notches.is_empty();
-          if let Some(ilk) = wants!( ipc.occilk.as_ref() );
           if let Some(ilk) = wants!( ioccults.ilks.get(ilk) );
           if let Some(bbox) = want!( Ok = ilk.p_occ.bbox_approx() );
           if let Some(size) = want!( Ok = bbox.br() - bbox.tl(), ?(bbox) );