From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Apr 2022 10:36:43 +0000 (+0100)
Subject: ilk mixing: piece_pri: Hoist pri_occulted call
X-Git-Tag: otter-1.1.0~511
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e4e766671802578775af42eef675a5996991751a;p=otter.git

ilk mixing: piece_pri: Hoist pri_occulted call

We are going to want to add a new branch to these conditionals, and
the new branch doesn't want this functionality.

No functional change.

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

diff --git a/src/hidden.rs b/src/hidden.rs
index cacef9a1..993c98e3 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -285,12 +285,13 @@ pub fn piece_pri(
   piece: PieceId, gpc: &GPiece, _ipc: &IPiece,
 ) -> Option<PieceRenderInstructions>
 {
-  let occk = if_chain! {
+  let mut occk_dbg = None;
+  let occulted = if_chain! {
     if let Some(Passive { occid, notch }) = gpc.occult.passive;
     if let Some(occ) = occults.occults.get(occid);
     if let Some(zg) = occ.notch_zg(notch);
     then {
-      occ.views.get_kind(player)
+      let occk = occ.views.get_kind(player)
         .map_displaced(|(displace, z)| {
           let notch: NotchNumber = notch.into();
           let pos = displace.place(occ.ppiece_use_size, notch);
@@ -301,19 +302,19 @@ pub fn piece_pri(
               z.clone()
             });
           (pos, ZLevel { z, zg })
-        })
+        });
+
+      occk_dbg = Some(occk.clone());
+      match occk.pri_occulted() {
+        Some(o) => o,
+        None => {
+          trace_dbg!("piece_pri", player, piece, occk_dbg, gpc);
+          return None;
+        }
+      }
     }
     else {
-      OccKG::Visible
-    }
-  };
-
-  let occk_dbg = occk.clone();
-  let occulted = match occk.pri_occulted() {
-    Some(o) => o,
-    None => {
-      trace_dbg!("piece_pri", player, piece, occk_dbg, gpc);
-      return None;
+      PriOG::Visible(ShowUnocculted(()))
     }
   };