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

Merge remote-tracking branch 'scrawl/master'

This commit is contained in:
Marc Zinnschlag 2013-07-31 09:14:12 +02:00
commit eedced729f
4 changed files with 9 additions and 4 deletions

View file

@ -99,9 +99,11 @@ namespace MWRender
MWBase::Environment::get().getSoundManager()->setListenerPosDir(pos, dir, up); MWBase::Environment::get().getSoundManager()->setListenerPosDir(pos, dir, up);
} }
void Camera::update(float duration) void Camera::update(float duration, bool paused)
{ {
updateListener(); updateListener();
if (paused)
return;
// only show the crosshair in game mode and in first person mode. // only show the crosshair in game mode and in first person mode.
MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager(); MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();

View file

@ -84,7 +84,7 @@ namespace MWRender
void processViewChange(); void processViewChange();
void update(float duration); void update(float duration, bool paused=false);
/// Set camera distance for current mode. Don't work on 1st person view. /// Set camera distance for current mode. Don't work on 1st person view.
/// \param adjust Indicates should distance be adjusted or set. /// \param adjust Indicates should distance be adjusted or set.

View file

@ -351,11 +351,11 @@ void RenderingManager::update (float duration, bool paused)
applyFog(world->isUnderwater(player.getCell(), cam)); applyFog(world->isUnderwater(player.getCell(), cam));
mCamera->update(duration, paused);
if(paused) if(paused)
return; return;
mCamera->update(duration);
mActors.update (duration); mActors.update (duration);
mObjects.update (duration); mObjects.update (duration);

View file

@ -53,6 +53,9 @@ namespace MWSound
, mFootstepsVolume(1.0f) , mFootstepsVolume(1.0f)
, mVoiceVolume(1.0f) , mVoiceVolume(1.0f)
, mPausedSoundTypes(0) , mPausedSoundTypes(0)
, mListenerPos(0,0,0)
, mListenerDir(1,0,0)
, mListenerUp(0,0,1)
{ {
if(!useSound) if(!useSound)
return; return;