summaryrefslogtreecommitdiff
path: root/src/purgatory.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-09-24 09:38:18 +0200
committertroido <troido@protonmail.com>2020-09-24 09:38:18 +0200
commit523a635dc88bc7890a0e1d3c062a8165259761d6 (patch)
tree56b0e379349250ecbf75eda6ccdb1f6f791dcbb1 /src/purgatory.rs
parentdaaf3a25e9c6cc1843b0a3aff71d4142f83dde10 (diff)
don't try to read into the json data structure all manually
Diffstat (limited to 'src/purgatory.rs')
-rw-r--r--src/purgatory.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/purgatory.rs b/src/purgatory.rs
index 27db35a..f387b83 100644
--- a/src/purgatory.rs
+++ b/src/purgatory.rs
@@ -1,6 +1,7 @@
use serde_json::json;
+use serde::Deserialize;
use specs::{
DispatcherBuilder
};
@@ -30,7 +31,7 @@ pub fn create_purgatory<'a, 'b>(encyclopedia: &Encyclopedia) -> Room<'a, 'b> {
.with(Move, "move", &["controlinput", "controlai"])
.build();
let mut room = Room::new(purgatory_id(), encyclopedia.clone(), Some(dispatcher));
- room.load_from_template(&RoomTemplate::from_json(&json!({
+ room.load_from_template(&RoomTemplate::deserialize(&json!({
"width": 15,
"height": 20,
"spawn": [7, 9],