mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 19:53:53 +00:00
Code Issues Releases Wiki Activity

Fix tab characters

Browse source
This commit is contained in:
Sergey Fukanchik 2018-09-23 02:46:29 +03:00
parent c50ee22772
commit 44bcd9b25f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwgui/waitdialog.cpp
View file

@ -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}");

4
apps/openmw/mwworld/worldimp.cpp
View file

@ -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;