diff options
| author | troido <troido@protonmail.com> | 2020-02-21 17:49:50 +0100 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-02-21 17:49:50 +0100 |
| commit | 07cc6d8919193c38cc13b2567ede5a510938db18 (patch) | |
| tree | 83588f118036fa56905043eb23c5a1d79e0497da /src/persistence.rs | |
| parent | e69d9c3b5266fd6f9215d1e3f4a761b8027a785c (diff) | |
players can now go to different rooms
Diffstat (limited to 'src/persistence.rs')
| -rw-r--r-- | src/persistence.rs | 7 |
1 files changed, 3 insertions, 4 deletions
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<PlayerState> { @@ -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<()> { |
