From bed96e5a3d59dee6b36a8cc5939109eb49dc390d Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 25 Dec 2017 03:26:28 +0200 Subject: [PATCH] [Client] Remove check of GM_RestBed GUI mode that no longer exists --- apps/openmw/mwmp/processors/player/ProcessorGameSettings.hpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/openmw/mwmp/processors/player/ProcessorGameSettings.hpp b/apps/openmw/mwmp/processors/player/ProcessorGameSettings.hpp index c668dc897..f5e5aaebd 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorGameSettings.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorGameSettings.hpp @@ -25,9 +25,7 @@ namespace mwmp if (MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_Console && !player->consoleAllowed) MWBase::Environment::get().getWindowManager()->popGuiMode(); else if (MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_Rest && - (!player->wildernessRestAllowed || !player->waitAllowed)) - MWBase::Environment::get().getWindowManager()->popGuiMode(); - else if (MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_RestBed && !player->bedRestAllowed) + (!player->bedRestAllowed || !player->wildernessRestAllowed || !player->waitAllowed)) MWBase::Environment::get().getWindowManager()->popGuiMode(); } }