diff options
| author | troido <troido@protonmail.com> | 2020-09-26 00:05:03 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-09-26 00:05:03 +0200 |
| commit | 345251f20401a71f7e7e00f4810b92af39ad4395 (patch) | |
| tree | 4f1f64a4f09e81fb98bb786865d5164048440321 /src/roomtemplate.rs | |
| parent | 9e2aa0f98cb93ea79db023f1309e083e59192293 (diff) | |
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
Diffstat (limited to 'src/roomtemplate.rs')
| -rw-r--r-- | src/roomtemplate.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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 }) } } |
