summaryrefslogtreecommitdiff
path: root/src/encyclopedia.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/encyclopedia.rs')
-rw-r--r--src/encyclopedia.rs3
1 files changed, 2 insertions, 1 deletions
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!({