use flags for the whole room instead of room permissions

the flags on a tile are the union of the flags from the entity on that tile and the room flags

2 files changed, 2 insertions, 11 deletions

diff --git a/src/resources/mod.rs b/src/resources/mod.rs
index 025bc6e..b65ca86 100644
--- a/src/resources/mod.rs
+++ b/src/resources/mod.rs
@@ -1,13 +1,12 @@
 
 mod ground;
 mod newentities;
-mod roompermissions;
 
 pub use ground::Ground;
 pub use newentities::NewEntities;
-pub use roompermissions::RoomPermissions;
 
 use std::collections::{HashMap, HashSet};
+use serde::{Serialize, Deserialize};
 use specs::{Entity};
 
 use crate::{
@@ -59,6 +58,6 @@ pub struct Time {
 	pub time: Timestamp
 }
 
-#[derive(Default, Debug, Clone)]
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
 pub struct RoomFlags(pub HashSet<Flag>);
 
diff --git a/src/resources/roompermissions.rs b/src/resources/roompermissions.rs
deleted file mode 100644
index e3646f3..0000000
--- a/src/resources/roompermissions.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Default, Debug, Clone, Deserialize, Serialize)]
-pub struct RoomPermissions {
-	#[serde(default)]
-	pub build: bool
-}