From 07cc6d8919193c38cc13b2567ede5a510938db18 Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 21 Feb 2020 17:49:50 +0100 Subject: players can now go to different rooms --- src/persistence.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/persistence.rs') diff --git a/src/persistence.rs b/src/persistence.rs index 07ff89b..aab4088 100644 --- a/src/persistence.rs +++ b/src/persistence.rs @@ -9,8 +9,7 @@ use crate::{ RoomId, savestate::SaveState, playerstate::PlayerState, - util::Result, - aerr + util::Result }; pub trait PersistentStorage { @@ -65,7 +64,7 @@ impl PersistentStorage for FileStorage { path.push(fname); let text = fs::read_to_string(path)?; let json: Value = serde_json::from_str(&text)?; - SaveState::from_json(&json).ok_or(aerr!("not a valid save state")) + SaveState::from_json(&json) } fn load_player(&self, id: PlayerId) -> Result { @@ -75,7 +74,7 @@ impl PersistentStorage for FileStorage { path.push(fname); let text = fs::read_to_string(path)?; let json: Value = serde_json::from_str(&text)?; - PlayerState::from_json(&json).ok_or(aerr!("not a valid save state")) + PlayerState::from_json(&json) } fn save_room(&self, id: RoomId, state: SaveState) -> Result<()> { -- cgit