mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 12:41:37 +00:00
Code Issues Releases Wiki Activity

Merge remote branch 'zini/master'

Browse source
This commit is contained in:
Yuri Krupenin 2011-01-08 16:24:26 +03:00
commit b791a8f6be
51 changed files with 1810 additions and 1806 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -67,7 +67,7 @@ void OMW::Engine::executeLocalScripts()
bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt) bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt)
{ {
if(! (mEnvironment.mSoundManager->isMusicPlaying())) if(mUseSound && !(mEnvironment.mSoundManager->isMusicPlaying()))
{ {
// Play some good 'ol tunes // Play some good 'ol tunes
mEnvironment.mSoundManager->startRandomTitle(); mEnvironment.mSoundManager->startRandomTitle();

6
apps/openmw/mwsound/soundmanager.cpp
View file

@ -365,7 +365,11 @@ namespace MWSound
bool SoundManager::isMusicPlaying() bool SoundManager::isMusicPlaying()
{ {
bool test = mData->music->isPlaying(); bool test = false;
if(mData && mData->music)
{
test = mData->music->isPlaying();
}
return test; return test;
} }