From 523a635dc88bc7890a0e1d3c062a8165259761d6 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Thu, 24 Sep 2020 09:38:18 +0200
Subject: don't try to read into the json data structure all manually

---
 src/purgatory.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/purgatory.rs')

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],
-- 
cgit