From 105c5ab0c0e969f3fda2cd43ae5195cbdb4da016 Mon Sep 17 00:00:00 2001 From: troido Date: Sun, 9 Feb 2020 18:53:27 +0100 Subject: Revert "no templates in the world; only pre-entities" This reverts commit b56add981c2f520789b97d1ee6f71dae41e8c900. --- src/systems/create.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/systems/create.rs') diff --git a/src/systems/create.rs b/src/systems/create.rs index 054dc1f..35ef747 100644 --- a/src/systems/create.rs +++ b/src/systems/create.rs @@ -34,13 +34,18 @@ impl <'a> System<'a> for Create { new.remove(ent); } } - for (pos, comps) in &new_entities.ents { + for (pos, template) in &new_entities.templates { let mut builder = updater.create_entity(&entities); - for comp in comps { - builder = comp.build(builder); + match new_entities.encyclopedia.construct(template) { + Ok(comps) => { + for comp in comps { + builder = comp.build(builder); + } + builder.with(Position::new(*pos)).with(New).build(); + }, + Err(msg) => {println!("{}", msg);} } - builder.with(Position::new(*pos)).with(New).build(); } - new_entities.ents.clear(); + new_entities.templates.clear(); } } -- cgit