From 790cb634434332bde73289b69601c571d553cde1 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sat, 9 Apr 2022 23:43:22 +0300 Subject: [PATCH] [Client] Prevent wildernessRestAllowed from affecting resting in beds Use less confusing message when unable to rest because of wildernessRestAllowed. --- apps/openmw/mwgui/waitdialog.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp index 4832319de..58253090e 100644 --- a/apps/openmw/mwgui/waitdialog.cpp +++ b/apps/openmw/mwgui/waitdialog.cpp @@ -154,9 +154,10 @@ namespace MWGui Prevent resting and waiting if they have been disabled by the server for the local player */ - else if (canRest == MWBase::World::Rest_Allowed && !mwmp::Main::get().getLocalPlayer()->wildernessRestAllowed) + else if (canRest == MWBase::World::Rest_Allowed && !mwmp::Main::get().getLocalPlayer()->wildernessRestAllowed && + !mwmp::Main::get().getLocalPlayer()->isUsingBed) { - MWBase::Environment::get().getWindowManager()->messageBox("You are not allowed to rest in the wilderness."); + MWBase::Environment::get().getWindowManager()->messageBox("You are not allowed to rest without a bed."); MWBase::Environment::get().getWindowManager()->popGuiMode(); } else if (canRest == MWBase::World::Rest_OnlyWaiting && !mwmp::Main::get().getLocalPlayer()->waitAllowed &&