Merge remote-tracking branch 'scrawl/master'

This commit is contained in:
Marc Zinnschlag 2012-08-18 13:04:30 +02:00
commit 3036b63175

View file

@ -5,6 +5,7 @@
#include <OgreRay.h> #include <OgreRay.h>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
@ -119,7 +120,8 @@ namespace MWRender
void Player::update(float duration) void Player::update(float duration)
{ {
if (!mVanity.enabled) { bool isGuiMode = MWBase::Environment::get().getWindowManager ()->isGuiMode();
if (!mVanity.enabled && !isGuiMode) {
++mUpdates; ++mUpdates;
mTimeIdle += duration; mTimeIdle += duration;
if (mTimeIdle > 30.f) { if (mTimeIdle > 30.f) {