From 46f491010b444e624e0eca8f05daefa839564454 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 22 Mar 2021 02:37:34 +0000 Subject: [PATCH] Hand: Make colour be ColourSpec Signed-off-by: Ian Jackson --- src/hand.rs | 2 +- src/spec.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hand.rs b/src/hand.rs index 6e8cd7fa..80a28b64 100644 --- a/src/hand.rs +++ b/src/hand.rs @@ -55,7 +55,7 @@ impl PieceSpec for piece_specs::Hand { -> PieceSpecLoaded { let common = SimpleCommon { itemname: None, - faces: index_vec![ColourSpec(self.colour.clone())], + faces: index_vec![self.colour.clone()], edges: self.edge.iter().cloned().collect(), edge_width: self.edge_width, }; diff --git a/src/spec.rs b/src/spec.rs index 3369eb60..e0b4d8e4 100644 --- a/src/spec.rs +++ b/src/spec.rs @@ -241,7 +241,7 @@ pub mod piece_specs { #[derive(Debug,Serialize,Deserialize)] pub struct Hand { - pub colour: String, + pub colour: ColourSpec, pub edge: Option, pub edge_width: Option, pub shape: Outline, -- 2.30.2