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 f9dba2b0762bcb9d691381014c58c1fe00a19ddc..79a351f907936b4b6fb451ba19c28eb265459435 100644 (file)
--- 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> {