hidden: Make an OccultationKindGeneral generic over displacement

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

diff --git a/src/hand.rs b/src/hand.rs
index dc9699fc8a754c8338701477ef00bcd5bd5135b1..7551a53892ed0fe1ef9b4221142acf8bba548271 100644 (file)
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -184,7 +184,7 @@ impl PieceTrait for Hand {
           let views = OwnerOccultationView {
             owner: player,
             owner_view: OccK::Visible,
-            defview: OccK::Displaced { within: region },
+            defview: OccK::Displaced(region),
           }.views()?;
           dbgc!("claiming got region", &region, &views);
           Ok::<_,IE>((region, views))

diff --git a/src/hidden.rs b/src/hidden.rs
index 9856354749a15062472e1600b4843adb215c512e..e24bb9e75d6a4a0ca30740a890fa45e4b539e421 100644 (file)
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -46,12 +46,13 @@ pub struct OccultView {
 
 #[derive(Clone,Copy,Debug,Serialize,Deserialize)]
 #[derive(Eq,PartialEq,Hash)]
-pub enum OccultationKind {
+pub enum OccultationKindGeneral<D> {
   Visible,
   Scrambled,
-  Displaced { within: Area },
+  Displaced(D),
   Invisible,
 }
+pub type OccultationKind = OccultationKindGeneral<Area>;
 
 impl Default for OccultationKind {
   fn default() -> Self { OccK::Visible }
@@ -59,7 +60,7 @@ impl Default for OccultationKind {
 
 impl Ord for OccultationKind {
   fn cmp(&self, rhs: &Self) -> Ordering {
-    fn level(k: &OccK) -> u8 { use OccultationKind::*; match k {
+    fn level(k: &OccK) -> u8 { use OccKG::*; match k {
       Visible       => 0,
       Scrambled     => 1,
       Displaced{..} => 2,

diff --git a/src/prelude.rs b/src/prelude.rs
index 4b34c4baf14d6feb407ae23e3675e3a440db58a0..d06199f3988bea7957af3469665087f75928f322 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -160,6 +160,7 @@ pub type SpE = SpecError;
 
 // hidden.rs
 pub type OccK = OccultationKind;
+pub use OccultationKindGeneral as OccKG;
 
 // updates.rs
 pub type PUE = PreparedUpdateEntry;