mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'ragora/playdeathlevelupmusic'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-09-23 13:30:50 +02:00
commit 175d4f3d44
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/levelupdialog.cpp
View file

@ -5,6 +5,7 @@
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/soundmanager.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/fallback.hpp"
@ -191,6 +192,9 @@ namespace MWGui
setAttributeValues();
center();
// Play LevelUp Music
MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Triumph.mp3");
}
void LevelupDialog::onOkButtonClicked(MyGUI::Widget* sender)

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

@ -275,7 +275,7 @@ namespace MWMechanics
void Actors::engageCombat (const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, bool againstPlayer)
{
CreatureStats& creatureStats = actor1.getClass().getCreatureStats(actor1);
if (actor2.getClass().getCreatureStats(actor2).isDead()
|| actor1.getClass().getCreatureStats(actor1).isDead())
return;
@ -296,7 +296,7 @@ namespace MWMechanics
bool aggressive;
if (againstPlayer)
if (againstPlayer)
{
// followers with high fight should not engage in combat with the player (e.g. bm_bear_black_summon)
const std::list<MWWorld::Ptr>& followers = getActorsFollowing(actor2);
@ -1099,7 +1099,7 @@ namespace MWMechanics
void Actors::update (float duration, bool paused)
{
if(!paused)
{
{
static float timerUpdateAITargets = 0;
// target lists get updated once every 1.0 sec
@ -1207,12 +1207,13 @@ namespace MWMechanics
// check if we still have any player enemies to switch music
static bool isBattleMusic = false;
if (isBattleMusic && hostilesCount == 0)
if (isBattleMusic && hostilesCount == 0 && !(player.getClass().getCreatureStats(player).isDead() &&
MWBase::Environment::get().getSoundManager()->isMusicPlaying()))
{
MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
isBattleMusic = false;
}
else if (!isBattleMusic && hostilesCount > 0)
else if (!isBattleMusic && hostilesCount > 0)
{
MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle"));
isBattleMusic = true;

4
apps/openmw/mwmechanics/character.cpp
View file

@ -1703,6 +1703,10 @@ bool CharacterController::kill()
mIdleState = CharState_None;
mCurrentIdle.clear();
// Play Death Music if it was the player dying
if(mPtr.getRefData().getHandle()=="player")
MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
return true;
}