When scene changes, movement inputs are still recognized and holding …

…them down moves the character (#153)

common/action/src/lib.rs

@@ -5,7 +5,6 @@
 use bevy::prelude::*;
 pub use leafwing_input_manager::{self, action_state::ActionState};
 use leafwing_input_manager::{
-    action_state::ActionData,
     input_map::InputMap,
     plugin::InputManagerPlugin,
     user_input::{InputKind, UserInput},
@@ -21,10 +20,16 @@ impl bevy::app::Plugin for Plugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<ActionState<GlobalAction>>()
             .insert_resource(GlobalAction::input_map())
-            .add_plugins(InputManagerPlugin::<GlobalAction>::default())
-            .register_type::<GlobalAction>()
-            .register_type::<ActionState<GlobalAction>>()
-            .register_type::<ActionData>();
+            .add_plugins(InputManagerPlugin::<GlobalAction>::default());
+
+        #[cfg(feature = "devtools")]
+        {
+            use leafwing_input_manager::action_state::ActionData;
+
+            app.register_type::<GlobalAction>()
+                .register_type::<ActionState<GlobalAction>>()
+                .register_type::<ActionData>();
+        }
     }
 }
 

scenes/building1_basement1/src/lib.rs

@@ -181,8 +181,8 @@ fn smooth_exit(
         // reset local state for next time
         *exit_animation = None;
 
-        // be a good guy and don't invade other game loops with our controls
-        controls.consume_all();
+        // be a good guy and don't invade other game loops with "Enter"
+        controls.consume(&GlobalAction::Interact);
 
         use GlobalGameStateTransition::*;
         match *transition {

scenes/building1_player_floor/src/lib.rs

@@ -192,8 +192,8 @@ fn smooth_exit(
         // reset local state for next time
         *exit_animation = None;
 
-        // be a good guy and don't invade other game loops with our controls
-        controls.consume_all();
+        // be a good guy and don't invade other game loops with "Enter"
+        controls.consume(&GlobalAction::Interact);
 
         use GlobalGameStateTransition::*;
         match *transition {

scenes/clinic/src/lib.rs

@@ -151,8 +151,8 @@ fn exit(
 ) {
     info!("Leaving Clinic");
 
-    // be a good guy and don't invade other game loops with our controls
-    controls.consume_all();
+    // be a good guy and don't invade other game loops with "Enter"
+    controls.consume(&GlobalAction::Interact);
 
     use GlobalGameStateTransition::*;
     match *transition {

scenes/downtown/src/lib.rs

@@ -157,8 +157,8 @@ fn exit(
 ) {
     info!("Leaving downtown");
 
-    // be a good guy and don't invade other game loops with our controls
-    controls.consume_all();
+    // be a good guy and don't invade other game loops with "Enter"
+    controls.consume(&GlobalAction::Interact);
 
     use GlobalGameStateTransition::*;
     match *transition {

scenes/mall/src/lib.rs

@@ -150,8 +150,8 @@ fn exit(
 ) {
     info!("Leaving Mall");
 
-    // be a good guy and don't invade other game loops with our controls
-    controls.consume_all();
+    // be a good guy and don't invade other game loops with "Enter"
+    controls.consume(&GlobalAction::Interact);
 
     use GlobalGameStateTransition::*;
     match *transition {

scenes/meditation/src/lib.rs

@@ -178,8 +178,8 @@ fn all_cleaned_up(
     // reset local state for next time
     *since = None;
 
-    // be a good guy and don't invade other game loops with our controls
-    controls.consume_all();
+    // be a good guy and don't invade other game loops with "Enter"
+    controls.consume(&GlobalAction::Interact);
 
     use GlobalGameStateTransition::*;
     match *transition {

scenes/plant_shop/src/lib.rs

@@ -150,8 +150,8 @@ fn exit(
 ) {
     info!("Leaving {PlantShop:?}");
 
-    // be a good guy and don't invade other game loops with our controls
-    controls.consume_all();
+    // be a good guy and don't invade other game loops with "Enter"
+    controls.consume(&GlobalAction::Interact);
 
     use GlobalGameStateTransition::*;
     match *transition {

scenes/sewers/src/lib.rs

@@ -150,8 +150,8 @@ fn exit(
 ) {
     info!("Leaving {Sewers:?}");
 
-    // be a good guy and don't invade other game loops with our controls
-    controls.consume_all();
+    // be a good guy and don't invade other game loops with "Enter"
+    controls.consume(&GlobalAction::Interact);
 
     use GlobalGameStateTransition::*;
     match *transition {

scenes/twinpeaks_apartment/src/lib.rs

@@ -150,8 +150,8 @@ fn exit(
 ) {
     info!("Leaving {TwinpeaksApartment:?}");
 
-    // be a good guy and don't invade other game loops with our controls
-    controls.consume_all();
+    // be a good guy and don't invade other game loops with "Enter"
+    controls.consume(&GlobalAction::Interact);
 
     use GlobalGameStateTransition::*;
     match *transition {