From cb97acba42f98a8bc4e85e15e1ccd758999ac593 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <923113+tyrelsouza@users.noreply.github.com>
Date: Tue, 31 Aug 2021 16:08:22 -0400
Subject: [PATCH] labyrinth

---
 src/main.rs                 |  4 ++--
 src/map_builder/prefab.rs   | 22 +++++++++++-----------
 src/systems/player_input.rs |  3 ---
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index c9c9d25..f872a06 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,8 +11,8 @@ mod prelude {
     pub use legion::systems::CommandBuffer;
     pub use legion::world::SubWorld;
     pub use legion::*;
-    pub const SCREEN_WIDTH: i32 = 60;
-    pub const SCREEN_HEIGHT: i32 = 40;
+    pub const SCREEN_WIDTH: i32 = 80;
+    pub const SCREEN_HEIGHT: i32 = 50;
     pub const DISPLAY_WIDTH: i32 = SCREEN_WIDTH / 2;
     pub const DISPLAY_HEIGHT: i32 = SCREEN_HEIGHT / 2;
     pub use crate::camera::*;
diff --git a/src/map_builder/prefab.rs b/src/map_builder/prefab.rs
index 67e2826..9b001da 100644
--- a/src/map_builder/prefab.rs
+++ b/src/map_builder/prefab.rs
@@ -2,17 +2,17 @@ use crate::prelude::*;
 
 const FORTRESS: (&str, i32, i32) = (
     "
-------------
----######---
----#----#---
----#-M--#---
--###----###-
---M---------
--###----###-
----#----#---
----#----#---
----######---
-------------
+#-##########
+#-#--------#
+#-#-######-#
+#-#-#MMMM#-#
+#-#-#MMMM#-#
+#-#-#----#-#
+#-#-####-#-#
+#-#------#-#
+#-########-#
+#----------#
+############
 ",
     12,
     11,
diff --git a/src/systems/player_input.rs b/src/systems/player_input.rs
index 5d9aa6a..3ec8028 100644
--- a/src/systems/player_input.rs
+++ b/src/systems/player_input.rs
@@ -52,7 +52,6 @@ pub fn player_input(
             .unwrap();
         let mut enemies = <(Entity, &Point)>::query().filter(component::<Enemy>());
 
-        let mut did_something = false;
         if delta.x != 0 || delta.y != 0 {
             let mut hit_something = false;
             enemies
@@ -60,7 +59,6 @@ pub fn player_input(
                 .filter(|(_, pos)| **pos == destination)
                 .for_each(|(entity, _)| {
                     hit_something = true;
-                    did_something = true;
 
                     commands.push((
                         (),
@@ -72,7 +70,6 @@ pub fn player_input(
                 });
 
             if !hit_something {
-                did_something = true;
                 commands.push((
                     (),
                     WantsToMove {