teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Use the sound manager's update to make sure music is still playing

Browse source
This commit is contained in:
Chris Robinson 2012-03-20 10:46:10 -07:00
parent 0261aac518
commit 5ae47f783e
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/engine.cpp
View file

@ -117,11 +117,7 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
// sound // sound
if (mUseSound) if (mUseSound)
{
mEnvironment.mSoundManager->playPlaylist();
mEnvironment.mSoundManager->update (evt.timeSinceLastFrame); mEnvironment.mSoundManager->update (evt.timeSinceLastFrame);
}
// update GUI // update GUI
Ogre::RenderWindow* window = mOgre->getWindow(); Ogre::RenderWindow* window = mOgre->getWindow();

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

@ -384,6 +384,10 @@ namespace MWSound
{ {
timePassed = 0.0f; timePassed = 0.0f;
// Make sure music is still playing
if(!mMusic || !mMusic->isPlaying())
startRandomTitle();
Ogre::Camera *cam = mEnvironment.mWorld->getPlayer().getRenderer()->getCamera(); Ogre::Camera *cam = mEnvironment.mWorld->getPlayer().getRenderer()->getCamera();
Ogre::Vector3 nPos, nDir, nUp; Ogre::Vector3 nPos, nDir, nUp;
nPos = cam->getRealPosition(); nPos = cam->getRealPosition();

3
apps/openmw/mwsound/soundmanager.hpp
View file

@ -83,10 +83,9 @@ namespace MWSound
bool isMusicPlaying(); bool isMusicPlaying();
///< Returns true if music is playing ///< Returns true if music is playing
void playPlaylist(std::string playlist=""); void playPlaylist(std::string playlist);
///< Start playing music from the selected folder ///< Start playing music from the selected folder
/// \param name of the folder that contains the playlist /// \param name of the folder that contains the playlist
/// if none is set then it plays from the current playlist
void say(MWWorld::Ptr reference, const std::string& filename); void say(MWWorld::Ptr reference, const std::string& filename);
///< Make an actor say some text. ///< Make an actor say some text.