From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 31 Jan 2021 18:48:43 +0000 (+0000)
Subject: hidden prep: Provide GameOccults in GameState
X-Git-Tag: otter-0.4.0~589
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=637b22268dd69308716e8e59adf69f55299bd88c;p=otter.git

hidden prep: Provide GameOccults in GameState

This is currently empty and unused.  It's a placeholder which we are
going to plumb through everywhere.

NFC but breaks the savefile format.

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 21f11857..c6969042 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -160,6 +160,7 @@ fn execute(cs: &mut CommandStream, cmd: MgmtCommand) -> MgmtResponse {
         log: default(),
         gen: Generation(0),
         max_z: default(),
+        occults: default(),
       };
 
       let acl = default();
diff --git a/src/gamestate.rs b/src/gamestate.rs
index 28ef8e71..b4da878c 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -62,6 +62,7 @@ pub struct GameState {
   pub log: VecDeque<(Generation, Arc<CommittedLogEntry>)>,
   pub max_z: ZCoord,
   pub players: DenseSlotMap<PlayerId, GPlayerState>,
+  pub occults: GameOccults,
 }
 
 #[derive(Debug,Serialize,Deserialize,Clone)]
diff --git a/src/global.rs b/src/global.rs
index 3ee067f3..7adfea36 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -637,6 +637,7 @@ impl<'ig> InstanceGuard<'ig> {
       // These have special handling
       log: default(),
       pieces: default(),
+      occults: default(),
     };
 
     let held_by_old = |p: &PieceState| if_chain! {
@@ -670,6 +671,7 @@ impl<'ig> InstanceGuard<'ig> {
     let mut swap_things = |ig: &mut InstanceGuard| {
       mem::swap(&mut ig.c.g.gs.log,    &mut gs.log   );
       mem::swap(&mut ig.c.g.gs.pieces, &mut gs.pieces);
+      mem::swap(&mut ig.c.g.gs.occults,&mut gs.occults);
       mem::swap(&mut ig.c.g.gs,        &mut gs,   );
     };
     swap_things(self);
diff --git a/src/hidden.rs b/src/hidden.rs
index 72f99b20..f4760910 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -50,3 +50,7 @@ impl PerPlayerIdMap {
   }
 }
 
+#[derive(Clone,Debug,Default,Serialize,Deserialize)]
+pub struct GameOccults {
+  // todo
+}
diff --git a/src/imports.rs b/src/imports.rs
index bbdaeb7d..e04dbde1 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -90,7 +90,7 @@ pub use crate::debugreader::DebugReader;
 pub use crate::error::*;
 pub use crate::gamestate::*;
 pub use crate::global::*;
-pub use crate::hidden::PerPlayerIdMap;
+pub use crate::hidden::*;
 pub use crate::keydata::*;
 pub use crate::lens::*;
 pub use crate::mgmtchannel::*;