From 6d8f2356572fdeb83979990708796488295bcd7a Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Thu, 19 May 2022 09:25:26 -0500
Subject: [PATCH] Eliminate extra stage for sound icons and exploration.

---
 src/exploration.rs |  5 +----
 src/sound.rs       | 14 ++++----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/exploration.rs b/src/exploration.rs
index 78797dc..d4cda04 100644
--- a/src/exploration.rs
+++ b/src/exploration.rs
@@ -465,10 +465,7 @@ where
         app.register_type::<ExplorationFocused>()
             .register_type::<ExplorationType>()
             .register_type::<Mappable>()
-            .add_system_to_stage(
-                CoreStage::PostUpdate,
-                exploration_changed_announcement::<D>.chain(error_handler),
-            );
+            .add_system(exploration_changed_announcement::<D>.chain(error_handler));
         if config.exploration_control_states.is_empty() {
             app.add_system(exploration_focus::<S, A, D>)
                 .add_system(exploration_type_focus::<S, A>.chain(error_handler))
diff --git a/src/sound.rs b/src/sound.rs
index 6f3ef96..0b2fb4a 100644
--- a/src/sound.rs
+++ b/src/sound.rs
@@ -297,7 +297,6 @@ where
         if !app.world.contains_resource::<SoundConfig<S>>() {
             app.insert_resource(SoundConfig::<S>::default());
         }
-        const SOUND_ICON_AND_EXPLORATION_STAGE: &str = "sound_icon_and_exploration";
         let core_config = *app.world.get_resource::<CoreConfig>().unwrap();
         if let Some(context) = app.world.get_resource::<Context>() {
             context
@@ -315,18 +314,13 @@ where
                 CoreStage::PostUpdate,
                 sound_icon::<S>.after(TransformSystem::TransformPropagate),
             )
-            .add_stage_after(
+            .add_system_to_stage(
                 CoreStage::PostUpdate,
-                SOUND_ICON_AND_EXPLORATION_STAGE,
-                SystemStage::parallel(),
+                sound_icon_exploration_focus_changed.after(sound_icon::<S>),
             )
             .add_system_to_stage(
-                SOUND_ICON_AND_EXPLORATION_STAGE,
-                sound_icon_exploration_focus_changed,
-            )
-            .add_system_to_stage(
-                SOUND_ICON_AND_EXPLORATION_STAGE,
-                sound_icon_exploration_focus_removed,
+                CoreStage::PostUpdate,
+                sound_icon_exploration_focus_removed.after(sound_icon_exploration_focus_changed),
             )
             .add_system(scale_sounds);
     }