Hand: Make colour be ColourSpec

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

diff --git a/src/hand.rs b/src/hand.rs
index 6e8cd7faee23c717931055e1530a580af2f68f70..80a28b64f1a3b3b5cf664d91c789da0d244defb8 100644 (file)
--- 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 3369eb60084ed5a248f1c8177d2e47be12596efa..e0b4d8e43c0bc8435cdb5210b20ee3a492abac38 100644 (file)
--- 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<ColourSpec>,
     pub edge_width: Option<f64>,
     pub shape: Outline,