1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:23:52 +00:00

Merge remote-tracking branch 'greye/master'

This commit is contained in:
Marc Zinnschlag 2012-10-01 09:46:20 +02:00
commit 29633bd02f

View file

@ -94,7 +94,6 @@ namespace MWRender
} else {
mCameraNode->setOrientation(zr * xr);
}
updateListener();
}
std::string Player::getHandle() const
@ -123,6 +122,8 @@ namespace MWRender
void Player::update(float duration)
{
updateListener();
// only show the crosshair in game mode and in first person mode.
MWBase::Environment::get().getWindowManager ()->showCrosshair
(!MWBase::Environment::get().getWindowManager ()->isGuiMode () && (mFirstPersonView && !mVanity.enabled && !mPreviewMode));