From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 26 May 2022 00:04:46 +0000 (+0100)
Subject: shapelib: Fix backward incompatible unnotched, stack_pos
X-Git-Tag: otter-1.1.0~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=afe2e7d3f58499dbff5a44f5253dda477797b44d;p=otter.git

shapelib: Fix backward incompatible unnotched, stack_pos

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

diff --git a/src/deck.rs b/src/deck.rs
index 08137254..c90a843b 100644
--- a/src/deck.rs
+++ b/src/deck.rs
@@ -14,6 +14,7 @@ pub const ENABLED_DESC : HtmlLit = Html::lit("a pickup deck (enabled)");
 struct Deck {
   shape: GenericSimpleShape<(), RectOutline>,
   label: Option<PieceLabelLoaded>,
+  #[serde(default="PosC::zero")]
   stack_pos: Pos,
 }
 
diff --git a/src/hidden.rs b/src/hidden.rs
index 084e5dff..f1389081 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -52,6 +52,7 @@ pub struct Occultation {
   region: Region, // automatically affect pieces here
   occulter: PieceId, // kept in synch with PieceOccult::active
   notches: Notches, // kept in synch with PieceOccult::passive
+  #[serde(default)]
   unnotched: HashSet<PieceId>, // kept in synch with PieceOccult::passive
   ppiece_use_size: Pos, // taken from first piece
   #[serde(flatten)] views: OccultationViews,