From 8e44d57fdb1c7be69501ebdfc5f9f5d48642b065 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 2 Jul 2018 22:08:51 +0200 Subject: Initial drop in replacement implementation It's faster than the other one! Doesn't tesla yet, but still! Yay! --- src/input/json.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/input/json.rs') diff --git a/src/input/json.rs b/src/input/json.rs index bebb5be..6f0d5e8 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -19,14 +19,15 @@ pub fn read_expressive_state_from_file(filename: &str) -> Result<(engine::settin Ok((engine_settings, engine_state)) } -pub fn read_bitwise_state_from_file(filename: &str) -> Result> { +pub fn read_bitwise_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, bitwise_engine::BitwiseGameState), Box> { let mut file = File::open(filename)?; let mut content = String::new(); file.read_to_string(&mut content)?; let state: State = serde_json::from_str(content.as_ref())?; + let engine_settings = state.to_engine_settings(); let engine_state = state.to_bitwise_engine(); - Ok(engine_state) + Ok((engine_settings, engine_state)) } #[derive(Deserialize)] -- cgit v1.2.3