From 116b6345fd87d350bfc5871b0ebe5370e4a95827 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 May 2022 23:32:41 +0100 Subject: [PATCH] materials format: Read in game specs, but currently ignored Signed-off-by: Ian Jackson --- daemon/cmdlistener.rs | 1 + src/spec.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index e8c8b5ca..eed935fb 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -659,6 +659,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( .map_err(|e: toml::de::Error| ME::TomlSyntaxError(e.to_string()))?; let GameSpec { pieces, table_size, table_colour, pcaliases, + mformat: _, } = toml_de::from_value(&spec) .map_err(|e: toml_de::Error| ME::TomlStructureError(e.to_string()))?; diff --git a/src/spec.rs b/src/spec.rs index c5ca4019..0623ac33 100644 --- a/src/spec.rs +++ b/src/spec.rs @@ -212,6 +212,7 @@ pub struct GameSpec { #[serde(default)] pub pieces: Vec, #[serde(default="imp::def_table_colour")] pub table_colour: ColourSpec, #[serde(default)] pub pcaliases: HashMap>, + #[serde(default, rename="format")] pub mformat: materials_format::Version, } #[derive(Debug, Serialize, Deserialize)] -- 2.30.2