From c7530d921e5cd56d11bb2345c344ef8893dbecf5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 31 Jan 2021 22:41:49 +0000 Subject: [PATCH] hidden: Provide and use piece_at_all_occluded in cmdlistener We still don't deal with listing (partly) occluded pieces, or taking them into account for library placement. In the future this may become more sophisticaed. Signed-off-by: Ian Jackson --- daemon/cmdlistener.rs | 3 +-- src/hidden.rs | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index c6969042..43d65cd0 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -395,9 +395,8 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( let desc_html = pinfo.describe_html(None); let itemname = pinfo.itemname().to_string(); let bbox = pinfo.bbox_approx(); - let lens = TransparentLens { }; #[allow(irrefutable_let_patterns)] - let visible = if let TransparentLens { } = lens { + let visible = if ! piece_at_all_occluded(&ig.gs.occults, piece) { Some(MgmtGamePieceVisibleInfo { pos, face, desc_html, bbox }) diff --git a/src/hidden.rs b/src/hidden.rs index c706e273..ceb06c8b 100644 --- a/src/hidden.rs +++ b/src/hidden.rs @@ -70,6 +70,13 @@ pub fn piece_pri( PieceRenderInstructions { id: vpiece, angle, face } } +pub fn piece_at_all_occluded( + _occults: &GameOccults, // xxx + _piece: PieceId, // xxx +) -> bool { + false +} + pub fn vpiece_decode( _gs: &GameState, // xxx player: PlayerId, -- 2.30.2