From 523a635dc88bc7890a0e1d3c062a8165259761d6 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Thu, 24 Sep 2020 09:38:18 +0200
Subject: don't try to read into the json data structure all manually

---
 src/components/flags.rs | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'src/components/flags.rs')

diff --git a/src/components/flags.rs b/src/components/flags.rs
index d985bf2..25ec4ea 100644
--- a/src/components/flags.rs
+++ b/src/components/flags.rs
@@ -4,26 +4,17 @@ use specs::{
 	Component,
 	VecStorage,
 };
+use strum_macros::{EnumString, Display};
+use serde::{Serialize, Deserialize};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EnumString, Display, Serialize, Deserialize)]
 pub enum Flag {
 	Blocking,
 	Floor,
 	Occupied,
-	Soil
-}
-
-use Flag::*;
-impl Flag {
-	pub fn from_str(s: &str) -> Option<Flag> {
-		Some(match s {
-			"Blocking" => Blocking,
-			"Floor" => Floor,
-			"Occupied" => Occupied,
-			"Soil" => Soil,
-			_ => None?
-		})
-	}
+	Soil,
+	Build,
+	Hot
 }
 
 
-- 
cgit