From 80f163f65fa5ad4fe0b234769d7891cf12f526f6 Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Tue, 29 Jun 2021 10:31:18 -0500
Subject: [PATCH] Move new area initialization to existing collider
 initialization system.

---
 src/map.rs | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/map.rs b/src/map.rs
index cc86905..f292c54 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -209,6 +209,23 @@ fn add_map_colliders(mut commands: Commands, maps: Query<(Entity, &Map), Added<M
                 }
             }
         }
+        for room in &map.rooms {
+            commands
+                .spawn_bundle(ColliderBundle {
+                    collider_type: ColliderType::Sensor,
+                    shape: ColliderShape::cuboid(
+                        (room.width() / 2) as f32,
+                        (room.height() / 2) as f32,
+                    ),
+                    flags: ActiveEvents::INTERSECTION_EVENTS.into(),
+                    ..Default::default()
+                })
+                .insert(ColliderParent {
+                    handle: rigid_body_entity.handle(),
+                    pos_wrt_parent: Vec2::new(room.center().x(), room.center().y()).into(),
+                })
+                .insert(AreaTag);
+        }
     }
 }
 
@@ -331,21 +348,6 @@ fn add_areas(mut commands: Commands, query: Query<(Entity, &Map), (Added<Map>, W
     for (entity, map) in query.iter() {
         let mut v = vec![];
         for room in &map.rooms {
-            commands
-                .spawn_bundle(ColliderBundle {
-                    collider_type: ColliderType::Sensor,
-                    shape: ColliderShape::cuboid(
-                        (room.width() / 2) as f32,
-                        (room.height() / 2) as f32,
-                    ),
-                    flags: ActiveEvents::INTERSECTION_EVENTS.into(),
-                    ..Default::default()
-                })
-                .insert(ColliderParent {
-                    handle: entity.handle(),
-                    pos_wrt_parent: Vec2::new(room.center().x(), room.center().y()).into(),
-                })
-                .insert(AreaTag);
             v.push(Area {
                 rect: *room,
                 description: None,