From ec071d5bc677101c0168b5fb3065f2d928234ed9 Mon Sep 17 00:00:00 2001
From: Arne Dußin
Date: Mon, 11 Jan 2021 12:10:16 +0100
Subject: Rect rooms are now normal polygon rooms in data

Before there was an extra data type for rectangular rooms. This is now
changed, with the rectangle tool remaining, to create these often
required rooms faster, but the data type is just a normal polygon that
is generated from a rect to reduce redundancy.
---
 src/map/data.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/map/data.rs')

diff --git a/src/map/data.rs b/src/map/data.rs
index 0c11d1c..3258512 100644
--- a/src/map/data.rs
+++ b/src/map/data.rs
@@ -1,6 +1,6 @@
 //! Module containing the raw map data version of the map.
 
-use super::{IconData, Map, PolygonRoomData, RectRoomData, WallData};
+use super::{IconData, Map, PolygonRoomData, WallData};
 use ron::de::from_reader;
 use ron::ser::{to_string_pretty, PrettyConfig};
 use serde::{Deserialize, Serialize};
@@ -13,7 +13,6 @@ use std::path::Path;
 /// it easily corruptable.
 #[derive(Serialize, Deserialize)]
 pub struct MapData {
-    pub(super) rect_rooms: Vec<RectRoomData>,
     pub(super) polygon_rooms: Vec<PolygonRoomData>,
     pub(super) walls: Vec<WallData>,
     pub(super) icons: Vec<IconData>,
@@ -22,13 +21,11 @@ pub struct MapData {
 impl MapData {
     /// Create a serialisable map data type from the data elements contained in a map.
     pub fn new(
-        rect_rooms: Vec<RectRoomData>,
         polygon_rooms: Vec<PolygonRoomData>,
         walls: Vec<WallData>,
         icons: Vec<IconData>,
     ) -> Self {
         Self {
-            rect_rooms,
             polygon_rooms,
             walls,
             icons,
@@ -41,11 +38,6 @@ impl MapData {
     /// included.
     pub fn extract_data(map: &Map) -> Self {
         Self {
-            rect_rooms: map
-                .rect_rooms()
-                .iter()
-                .map(|r| *(r as &RectRoomData))
-                .collect(),
             polygon_rooms: map
                 .polygon_rooms()
                 .iter()
-- 
cgit v1.2.3-70-g09d2