mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 09:36:43 +00:00
Code Issues Releases Wiki Activity

Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest().

Browse source
This commit is contained in:
Sergey Fukanchik 2018-09-23 01:52:56 +03:00
parent 7be9f2ca45
commit c50ee22772
5 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/openmw/mwbase/world.hpp
View file

@ -438,12 +438,16 @@ namespace MWBase
virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0; virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0;
virtual int canRest() = 0; enum RestPermitted
///< check if the player is allowed to rest \n {
/// 0 - yes \n Rest_Allowed = 0,
/// 1 - only waiting \n Rest_OnlyWaiting = 1,
/// 2 - player is underwater \n Rest_PlayerIsUnderwater = 2,
/// 3 - enemies are nearby (not implemented) Rest_EnemiesAreNearby = 3
};
virtual RestPermitted canRest() = 0;
///< check if the player is allowed to rest
/// \todo Probably shouldn't be here /// \todo Probably shouldn't be here
virtual MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) = 0; virtual MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) = 0;

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

@ -83,7 +83,7 @@ namespace MWGui
void WaitDialog::setPtr(const MWWorld::Ptr &ptr) void WaitDialog::setPtr(const MWWorld::Ptr &ptr)
{ {
setCanRest(!ptr.isEmpty() || MWBase::Environment::get().getWorld ()->canRest () == 0); setCanRest(!ptr.isEmpty() || MWBase::Environment::get().getWorld ()->canRest () == MWBase::World::Rest_Allowed);
if (mUntilHealedButton->getVisible()) if (mUntilHealedButton->getVisible())
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mUntilHealedButton); MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mUntilHealedButton);
@ -120,9 +120,14 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->popGuiMode (); MWBase::Environment::get().getWindowManager()->popGuiMode ();
} }
int canRest = MWBase::Environment::get().getWorld ()->canRest (); MWBase::World::RestPermitted canRest = MWBase::Environment::get().getWorld ()->canRest ();
if (canRest == 2) if (canRest == MWBase::World::Rest_EnemiesAreNearby)
{
MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}");
MWBase::Environment::get().getWindowManager()->popGuiMode ();
}
else if (canRest == MWBase::World::Rest_PlayerIsUnderwater)
{ {
// resting underwater or mid-air not allowed // resting underwater or mid-air not allowed
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage1}"); MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage1}");

4
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -1029,10 +1029,6 @@ namespace MWInput
if (!MWBase::Environment::get().getWindowManager()->getRestEnabled () || MWBase::Environment::get().getWindowManager()->isGuiMode ()) if (!MWBase::Environment::get().getWindowManager()->getRestEnabled () || MWBase::Environment::get().getWindowManager()->isGuiMode ())
return; return;
if(mPlayer->enemiesNearby()) {//Check if in combat
MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}"); //Nope,
return;
}
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_Rest); //Open rest GUI MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_Rest); //Open rest GUI
} }

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

@ -2297,7 +2297,7 @@ namespace MWWorld
applyLoopingParticles(player); applyLoopingParticles(player);
} }
int World::canRest () World::RestPermitted World::canRest ()
{ {
CellStore *currentCell = mWorldScene->getCurrentCell(); CellStore *currentCell = mWorldScene->getCurrentCell();
@ -2309,13 +2309,16 @@ namespace MWWorld
if (!actor) if (!actor)
throw std::runtime_error("can't find player"); throw std::runtime_error("can't find player");
if(mPlayer->enemiesNearby())
return Rest_EnemiesAreNearby;
if ((actor->getCollisionMode() && !mPhysics->isOnSolidGround(player)) || isUnderwater(currentCell, playerPos) || isWalkingOnWater(player)) if ((actor->getCollisionMode() && !mPhysics->isOnSolidGround(player)) || isUnderwater(currentCell, playerPos) || isWalkingOnWater(player))
return 2; return Rest_PlayerIsUnderwater;
if((currentCell->getCell()->mData.mFlags&ESM::Cell::NoSleep) || player.getClass().getNpcStats(player).isWerewolf()) if((currentCell->getCell()->mData.mFlags&ESM::Cell::NoSleep) || player.getClass().getNpcStats(player).isWerewolf())
return 1; return Rest_OnlyWaiting;
return 0; return Rest_Allowed;
} }
MWRender::Animation* World::getAnimation(const MWWorld::Ptr &ptr) MWRender::Animation* World::getAnimation(const MWWorld::Ptr &ptr)

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -551,7 +551,7 @@ namespace MWWorld
void enableActorCollision(const MWWorld::Ptr& actor, bool enable) override; void enableActorCollision(const MWWorld::Ptr& actor, bool enable) override;
int canRest() override; World::RestPermitted canRest() override;
///< check if the player is allowed to rest \n ///< check if the player is allowed to rest \n
/// 0 - yes \n /// 0 - yes \n
/// 1 - only waiting \n /// 1 - only waiting \n