From b56add981c2f520789b97d1ee6f71dae41e8c900 Mon Sep 17 00:00:00 2001 From: troido Date: Sat, 8 Feb 2020 19:22:00 +0100 Subject: no templates in the world; only pre-entities --- src/encyclopedia.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/encyclopedia.rs') diff --git a/src/encyclopedia.rs b/src/encyclopedia.rs index 5cdf90c..6851a06 100644 --- a/src/encyclopedia.rs +++ b/src/encyclopedia.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use serde_json::Value; use crate::assemblage::Assemblage; -use crate::componentwrapper::ComponentWrapper; +use crate::componentwrapper::PreEntity; use crate::template::Template; #[derive(Default, Clone)] @@ -20,7 +20,7 @@ impl Encyclopedia { Ok(Encyclopedia{items}) } - pub fn construct(&self, template: &Template) -> Result, &'static str> { + pub fn construct(&self, template: &Template) -> Result { let assemblage = self.items.get(&template.name).ok_or("unknown assemblage name")?; assemblage.instantiate(&template.args, &template.kwargs) } -- cgit