From 331fb31c4054981e63602666bb4005bec9eba417 Mon Sep 17 00:00:00 2001 From: Franklin Date: Tue, 7 Nov 2023 13:10:45 -0400 Subject: [PATCH] Invalidated player controls when settings screen is up --- src/comps/core/controller.rs | 11 +++++--- src/logic/core/player/camera_player_sync.rs | 29 ++++++++++++--------- src/logic/core/player/hands.rs | 14 +++++----- src/ui/game/settings_screen.rs | 5 ++-- 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/comps/core/controller.rs b/src/comps/core/controller.rs index 8cbb661..4510e31 100644 --- a/src/comps/core/controller.rs +++ b/src/comps/core/controller.rs @@ -1,9 +1,9 @@ use bevy::prelude::*; use bevy_rapier3d::prelude::*; -use crate::logic::core::player::player_movement::{ +use crate::{logic::core::player::player_movement::{ move_player, PlayerLinearXZState, PlayerLinearYState, PlayerMovementInput, -}; +}, ui::game::settings::SettingsScreenUIConfiguration}; use super::markers::player::Player; @@ -22,6 +22,7 @@ pub fn capture_input( With, >, time: Res