mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 18:45:34 +00:00
Code Issues Releases Wiki Activity

Do not display werewolf overlay in third person

Browse source
This commit is contained in:
MiroslavR 2014-10-06 20:24:53 +02:00
parent 0e19c3fdeb
commit d1dc9951d4
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1559,6 +1559,8 @@ namespace MWGui
mForceHidden = GW_None; mForceHidden = GW_None;
setWerewolfOverlay(false);
mGuiModes.clear(); mGuiModes.clear();
MWBase::Environment::get().getInputManager()->changeInputMode(false); MWBase::Environment::get().getInputManager()->changeInputMode(false);
updateVisible(); updateVisible();
@ -1769,10 +1771,7 @@ namespace MWGui
if (!mWerewolfOverlayEnabled) if (!mWerewolfOverlayEnabled)
return; return;
if (set) mWerewolfFader->notifyAlphaChanged(set ? 1.0f : 0.0f);
mWerewolfFader->fadeOut(1.0f);
else
mWerewolfFader->fadeIn(1.0f);
} }
void WindowManager::onClipboardChanged(const std::string &_type, const std::string &_data) void WindowManager::onClipboardChanged(const std::string &_type, const std::string &_data)

4
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -36,6 +36,7 @@
#include "../mwbase/statemanager.hpp" #include "../mwbase/statemanager.hpp"
#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/npcstats.hpp"
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
@ -346,6 +347,9 @@ void RenderingManager::update (float duration, bool paused)
MWBase::Environment::get().getWindowManager()->setScreenFactor(std::max(0.f, 1.f-(blind / 100.f))); MWBase::Environment::get().getWindowManager()->setScreenFactor(std::max(0.f, 1.f-(blind / 100.f)));
setAmbientMode(); setAmbientMode();
if (player.getClass().getNpcStats(player).isWerewolf())
MWBase::Environment::get().getWindowManager()->setWerewolfOverlay(mCamera->isFirstPerson());
// player position // player position
MWWorld::RefData &data = player.getRefData(); MWWorld::RefData &data = player.getRefData();
Ogre::Vector3 playerPos(data.getPosition().pos); Ogre::Vector3 playerPos(data.getPosition().pos);