From 6f6b8986b6732c4629f69d4e592a8bf288ccd1c2 Mon Sep 17 00:00:00 2001 From: Capucho Date: Tue, 3 Mar 2020 22:07:49 +0000 Subject: [PATCH] Removed logging, added the changes to the changelog and fixed the logout button --- CHANGELOG.md | 1 + voxygen/src/hud/mod.rs | 5 +++++ voxygen/src/session.rs | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 227c50b450..cd4f119c21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added sfx for collecting, dropping and using inventory items - New attack animation - weapon control system +- Game pauses when in singleplayer and pause menu ### Changed diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 7b6e2ee78b..25d41537fe 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -1934,6 +1934,11 @@ impl Hud { }; }, Some(esc_menu::Event::Logout) => { + // Unpause the game if we are on singleplayer so that we can logout + if let Some(singleplayer) = global_state.singleplayer.as_ref() { + singleplayer.pause(false); + }; + events.push(Event::Logout); }, Some(esc_menu::Event::Quit) => events.push(Event::Quit), diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs index ba92e95cdd..7670eb1b1e 100644 --- a/voxygen/src/session.rs +++ b/voxygen/src/session.rs @@ -383,10 +383,6 @@ impl PlayState for SessionState { if global_state.singleplayer.is_none() || !global_state.singleplayer.as_ref().unwrap().is_paused() { - log::warn!( - "{}", - global_state.singleplayer.as_ref().unwrap().is_paused() - ); // Perform an in-game tick. if let Err(err) = self.tick(clock.get_avg_delta()) { global_state.info_message =