From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 16 Mar 2021 11:50:29 +0000 (+0000)
Subject: hidden: make OccKG::pri_occulted generic
X-Git-Tag: otter-0.4.0~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d14797d34de56afc9b653e819fae04b9c52492e2;p=otter.git

hidden: make OccKG::pri_occulted generic

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

diff --git a/src/hidden.rs b/src/hidden.rs
index f9dba2b0..79a351f9 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -105,15 +105,16 @@ impl OccultationKind {
   }
 }
 
-impl OccultationKindGeneral<(Pos, ZLevel)> {
-  pub fn pri_occulted(self) -> Option<PriOcculted> {
+impl<P,Z> OccultationKindGeneral<(P, Z)> {
+  pub fn pri_occulted(self) -> Option<PriOccultedGeneral<P,Z>> {
     Some(match self {
       OccKG::Invisible          => return None,
-      OccKG::Visible            => PriOcculted::Visible(ShowUnocculted(())),
-      OccKG::Scrambled          => PriOcculted::Occulted,
-      OccKG::Displaced((pos,z)) => PriOcculted::Displaced(pos, z),
+      OccKG::Visible            => PriOG::Visible(ShowUnocculted(())),
+      OccKG::Scrambled          => PriOG::Occulted,
+      OccKG::Displaced((pos,z)) => PriOG::Displaced(pos, z),
     })
   }
+
 }
 
 impl<T> OccultationKindGeneral<T> {