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

Merge remote-tracking branch 'scrawl/music'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-07-19 11:49:00 +02:00
commit 9b3d5c958f
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/engine.cpp
View file

@ -646,9 +646,6 @@ void OMW::Engine::go()
prepareEngine (settings); prepareEngine (settings);
// Play some good 'ol tunes
MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
if (!mSaveGameFile.empty()) if (!mSaveGameFile.empty())
{ {
MWBase::Environment::get().getStateManager()->loadGame(mSaveGameFile); MWBase::Environment::get().getStateManager()->loadGame(mSaveGameFile);

10
apps/openmw/mwmechanics/actors.cpp
View file

@ -1069,18 +1069,18 @@ namespace MWMechanics
killDeadActors(); killDeadActors();
// check if we still have any player enemies to switch music // check if we still have any player enemies to switch music
static bool isBattleMusic = false; static int currentMusic = 0;
if (isBattleMusic && hostilesCount == 0 && !(player.getClass().getCreatureStats(player).isDead() && if (currentMusic != 1 && hostilesCount == 0 && !(player.getClass().getCreatureStats(player).isDead() &&
MWBase::Environment::get().getSoundManager()->isMusicPlaying())) MWBase::Environment::get().getSoundManager()->isMusicPlaying()))
{ {
MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore")); MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
isBattleMusic = false; currentMusic = 1;
} }
else if (!isBattleMusic && hostilesCount > 0) else if (currentMusic != 2 && hostilesCount > 0)
{ {
MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle")); MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle"));
isBattleMusic = true; currentMusic = 2;
} }
static float sneakTimer = 0.f; // times update of sneak icon static float sneakTimer = 0.f; // times update of sneak icon