From e6476e7afff0234d67ebce7c74e4c91c31d87755 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Thu, 24 Sep 2020 13:10:54 +0200
Subject: actually use the serde serialisation more

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

(limited to 'src/encyclopedia.rs')

diff --git a/src/encyclopedia.rs b/src/encyclopedia.rs
index 70f0ac6..8acd7e9 100644
--- a/src/encyclopedia.rs
+++ b/src/encyclopedia.rs
@@ -1,6 +1,7 @@
 
 use std::collections::HashMap;
 use serde_json::{Value, json};
+use serde::Deserialize;
 use crate::{
 	assemblage::Assemblage,
 	componentwrapper::PreEntity,
@@ -59,7 +60,7 @@ impl Encyclopedia {
 					name: name.clone(),
 					ent:
 						if let Some(ent) = v.get("entity") {
-							Template::from_json(ent)?
+							Template::deserialize(ent).map_err(|e| perr!("template json error deserializing {:?} {:?}", ent, e))?
 						} else {
 							let enttyp = EntityType(k.clone());
 							assemblages.insert(enttyp.clone(), Assemblage::from_json(&json!({
-- 
cgit