From 345251f20401a71f7e7e00f4810b92af39ad4395 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Sat, 26 Sep 2020 00:05:03 +0200
Subject: 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
---
 src/roomtemplate.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/roomtemplate.rs')

diff --git a/src/roomtemplate.rs b/src/roomtemplate.rs
index b9bb0e1..1b920ac 100644
--- a/src/roomtemplate.rs
+++ b/src/roomtemplate.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Deserializer, de, Serialize};
 use crate::{
 	Pos,
 	Template,
-	resources::RoomPermissions
+	resources::RoomFlags
 };
 
 #[derive(Debug, Clone)]
@@ -13,7 +13,7 @@ pub struct RoomTemplate {
 	pub spawn: Pos,
 	pub field: Vec<Vec<Template>>,
 	pub places: HashMap<String, Pos>,
-	pub permissions: RoomPermissions
+	pub flags: RoomFlags
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -26,7 +26,7 @@ struct RoomTemplateSave {
 	#[serde(default)]
 	pub places: HashMap<String, Pos>,
 	#[serde(default)]
-	pub permissions: RoomPermissions
+	pub flags: RoomFlags
 }
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
@@ -57,7 +57,7 @@ impl<'de> Deserialize<'de> for RoomTemplate {
 			spawn: rts.spawn,
 			field,
 			places: rts.places,
-			permissions: rts.permissions
+			flags: rts.flags
 		})
 	}
 }
-- 
cgit