From 44bcd9b25fa8c94da732de933e2465185d58673c Mon Sep 17 00:00:00 2001 From: Sergey Fukanchik Date: Sun, 23 Sep 2018 02:46:29 +0300 Subject: [PATCH] Fix tab characters --- apps/openmw/mwgui/waitdialog.cpp | 8 ++++---- apps/openmw/mwworld/worldimp.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp index 37cc9a59f6..db92b355ce 100644 --- a/apps/openmw/mwgui/waitdialog.cpp +++ b/apps/openmw/mwgui/waitdialog.cpp @@ -120,14 +120,14 @@ namespace MWGui MWBase::Environment::get().getWindowManager()->popGuiMode (); } - MWBase::World::RestPermitted canRest = MWBase::Environment::get().getWorld ()->canRest (); + MWBase::World::RestPermitted canRest = MWBase::Environment::get().getWorld ()->canRest (); - if (canRest == MWBase::World::Rest_EnemiesAreNearby) + if (canRest == MWBase::World::Rest_EnemiesAreNearby) { MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}"); MWBase::Environment::get().getWindowManager()->popGuiMode (); - } - else if (canRest == MWBase::World::Rest_PlayerIsUnderwater) + } + else if (canRest == MWBase::World::Rest_PlayerIsUnderwater) { // resting underwater or mid-air not allowed MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage1}"); diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 458ff3a01d..1b3e3c3ef9 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -2309,8 +2309,8 @@ namespace MWWorld if (!actor) throw std::runtime_error("can't find player"); - if(mPlayer->enemiesNearby()) - return Rest_EnemiesAreNearby; + if(mPlayer->enemiesNearby()) + return Rest_EnemiesAreNearby; if ((actor->getCollisionMode() && !mPhysics->isOnSolidGround(player)) || isUnderwater(currentCell, playerPos) || isWalkingOnWater(player)) return Rest_PlayerIsUnderwater;