Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rdbaker/fix-settings-unpause-bug' into 'master'

Browse Source 
fixes #712 - where pressing N to leave Settings doesn't unpause a single player game world

Closes #712

See merge request veloren/veloren!1312
This commit is contained in:
Marcel 2020-08-18 22:55:05 +00:00
commit 4942b5b394
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
### Changed
- Fixed a bug where leaving the Settings menu by pressing "N" in single player kept the game paused
### Removed

20
voxygen/src/hud/mod.rs
View File

@ -457,10 +457,20 @@ impl Show {
}
}
fn toggle_settings(&mut self) {
fn toggle_settings(&mut self, global_state: &GlobalState) {
match self.open_windows {
Windows::Settings => self.settings(false),
_ => self.settings(true),
Windows::Settings => {
#[cfg(feature = "singleplayer")]
global_state.unpause();
self.settings(false);
},
_ => {
#[cfg(feature = "singleplayer")]
global_state.pause();
self.settings(true)
},
};
}
@ -1615,7 +1625,7 @@ impl Hud {
.set(self.ids.buttons, ui_widgets)
{
Some(buttons::Event::ToggleBag) => self.show.toggle_bag(),
Some(buttons::Event::ToggleSettings) => self.show.toggle_settings(),
Some(buttons::Event::ToggleSettings) => self.show.toggle_settings(global_state),
Some(buttons::Event::ToggleSocial) => self.show.toggle_social(),
Some(buttons::Event::ToggleSpell) => self.show.toggle_spell(),
Some(buttons::Event::ToggleMap) => self.show.toggle_map(),
@ -2294,7 +2304,7 @@ impl Hud {
true
},
GameInput::Settings if state => {
self.show.toggle_settings();
self.show.toggle_settings(global_state);
true
},
GameInput::Help if state => {