From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 25 Mar 2021 17:16:41 +0000 (+0000)
Subject: instance save: Make various things non-optional
X-Git-Tag: otter-0.5.0~410
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=adbbf6043bc6ca3784e9131b121e2142f13ce657;p=otter.git

instance save: Make various things non-optional

We recently totally broke savefile compatibility anyway.

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

diff --git a/src/gamestate.rs b/src/gamestate.rs
index efaef512..7183c398 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -68,12 +68,12 @@ pub struct GPiece{  // usual variable: gpc
   pub zlevel: ZLevel,
   pub pinned: bool,
   pub occult: PieceOccult,
-  #[serde(default)] pub angle: PieceAngle,
+  pub angle: PieceAngle,
   pub gen: Generation,
   pub lastclient: ClientId,
   pub gen_before_lastclient: Generation,
   pub xdata: PieceXDataState,
-  #[serde(default)] pub moveable: PieceMoveable,
+  pub moveable: PieceMoveable,
 }
 
 pub type PieceXDataState = Option<Box<dyn PieceXData>>;
diff --git a/src/global.rs b/src/global.rs
index a8444974..ac9206ea 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -232,11 +232,11 @@ pub struct InstanceContainer {
 #[derive(Debug,Default,Serialize,Deserialize)]
 struct InstanceSaveAccesses<RawTokenStr, PiecesLoadedRef, OccultIlksRef> {
   ipieces: PiecesLoadedRef,
-  #[serde(default)] ioccults: OccultIlksRef,
+  ioccults: OccultIlksRef,
   tokens_players: Vec<(RawTokenStr, PlayerId)>,
   aplayers: SecondarySlotMap<PlayerId, IPlayer>,
   acl: Acl<TablePermission>,
-  #[serde(default)] pub links: Arc<LinksTable>,
+  pub links: Arc<LinksTable>,
 }
 
 display_as_debug!{InstanceLockError}