From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 28 Feb 2021 21:39:20 +0000 (+0000)
Subject: Fix confusion, "occluded" should read "occulted"
X-Git-Tag: otter-0.4.0~261
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9c13aa3d5f67e21ae14480d8c74c7358ea5367e6;p=otter.git

Fix confusion, "occluded" should read "occulted"

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index e39ed1bf..309641cd 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -379,7 +379,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
         |(piece,gpc)| (|| Ok::<_,MgmtError>(if_chain!{
           let &GPiece { pos, face, .. } = gpc;
           if let Some(p) = ig.ipieces.get(piece);
-          let visible = if ! piece_at_all_occluded(&ig.gs.occults, piece) {
+          let visible = if ! piece_at_all_occulted(&ig.gs.occults, piece) {
             // todo: something more sophisticated would be nice
             let pri = PieceRenderInstructions::new_visible(
               // visible id is internal one here
diff --git a/src/gamestate.rs b/src/gamestate.rs
index 7eceb6fc..b75e875b 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -356,15 +356,15 @@ impl PieceXDataExt for PieceXDataState {
 #[derive(Debug,Clone)]
 pub struct PieceRenderInstructions {
   pub vpid: VisiblePieceId,
-  pub occluded: PriOccluded,
+  pub occulted: PriOcculted,
 }
 
 #[derive(Debug,Clone,Copy)]
-pub enum PriOccluded { Visible /*, Occluded*/ }
+pub enum PriOcculted { Visible /*, Occluded*/ }
 
 impl PieceRenderInstructions {
   pub fn new_visible(vpid: VisiblePieceId) -> PieceRenderInstructions {
-    PieceRenderInstructions { vpid, occluded: PriOccluded::Visible }
+    PieceRenderInstructions { vpid, occulted: PriOcculted::Visible }
   }
 
   #[throws(IE)]
@@ -375,7 +375,7 @@ impl PieceRenderInstructions {
     fn inner(pri: &PieceRenderInstructions, gpc: &GPiece, p: &dyn PieceTrait)
              -> Html
   {
-    let PriOccluded::Visible = pri.occluded;
+    let PriOcculted::Visible = pri.occulted;
 
     let mut defs = Html(String::new());
     let dragraise = match p.thresh_dragraise()? {
@@ -403,7 +403,7 @@ impl PieceRenderInstructions {
     fn inner(pri: &PieceRenderInstructions, gpc: &GPiece, p: &dyn PieceTrait)
              -> Html
   {
-    let PriOccluded::Visible = pri.occluded;
+    let PriOcculted::Visible = pri.occulted;
 
     pri.describe_fallible(gpc, p)
       .unwrap_or_else(|e| {
@@ -420,7 +420,7 @@ impl PieceRenderInstructions {
   }
 
   pub fn angle(&self, gpc: &GPiece) -> VisiblePieceAngle {
-    let PriOccluded::Visible = self.occluded;
+    let PriOcculted::Visible = self.occulted;
 
     gpc.angle
   }
@@ -429,7 +429,7 @@ impl PieceRenderInstructions {
   pub fn ui_operations(&self, gpc: &GPiece, p: &dyn PieceTrait)
                    -> Vec<UoDescription>
   {
-    let PriOccluded::Visible = self.occluded;
+    let PriOcculted::Visible = self.occulted;
     type WRC = WhatResponseToClientOp;
 
     let mut out = vec![];
diff --git a/src/hidden.rs b/src/hidden.rs
index b1e68f7d..69c5826e 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -192,15 +192,15 @@ fn inner(
 {
   let vpid = gpl.idmap.fwd_or_insert(piece);
   let angle = gpc.angle;
-  let occluded = PriOccluded::Visible; // xxx
+  let occulted = PriOcculted::Visible; // xxx
   trace!("{} {:?} => {} angle={:?}",
          player, piece, vpid, angle);
-  Some(PieceRenderInstructions { vpid, occluded })
+  Some(PieceRenderInstructions { vpid, occulted })
 }
   inner(occults, player, gpl, piece, gpc, p.borrow())
 }
 
-pub fn piece_at_all_occluded(
+pub fn piece_at_all_occulted(
   _occults: &GameOccults, // xxx
   _piece: PieceId, // xxx
 ) -> bool {