From 105c5ab0c0e969f3fda2cd43ae5195cbdb4da016 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Sun, 9 Feb 2020 18:53:27 +0100
Subject: Revert "no templates in the world; only pre-entities"

This reverts commit b56add981c2f520789b97d1ee6f71dae41e8c900.
---
 src/resources.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/resources.rs')

diff --git a/src/resources.rs b/src/resources.rs
index 82c7787..15d93c4 100644
--- a/src/resources.rs
+++ b/src/resources.rs
@@ -4,8 +4,10 @@ use specs::Entity;
 
 use super::pos::Pos;
 use super::controls::Action;
+// use super::oldassemblage::Assemblage;
 use super::worldmessages::WorldMessage;
-use crate::componentwrapper::PreEntity;
+use super::template::Template;
+use crate::encyclopedia::Encyclopedia;
 
 
 #[derive(Default)]
@@ -36,5 +38,6 @@ pub struct Ground {
 
 #[derive(Default)]
 pub struct NewEntities {
-	pub ents: Vec<(Pos, PreEntity)>
+	pub templates: Vec<(Pos, Template)>,
+	pub encyclopedia: Encyclopedia
 }
-- 
cgit