mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 00:45:32 +00:00
Code Issues Releases Wiki Activity

Combat music; some minor combat fixes

Browse source
This commit is contained in:
mrcheko 2014-06-10 14:20:29 +04:00
parent 698cbba6ef
commit 979128b2c5
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -970,6 +970,9 @@ namespace MWMechanics
} }
// Kill dead actors, update some variables // Kill dead actors, update some variables
int hostilesCount = 0; // need to know this to play Battle music
for(PtrControllerMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter) for(PtrControllerMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
{ {
const MWWorld::Class &cls = iter->first.getClass(); const MWWorld::Class &cls = iter->first.getClass();
@ -988,6 +991,8 @@ namespace MWMechanics
if(!stats.isDead()) if(!stats.isDead())
{ {
if (stats.isHostile()) hostilesCount++;
if(iter->second->isDead()) if(iter->second->isDead())
{ {
// Actor has been resurrected. Notify the CharacterController and re-enable collision. // Actor has been resurrected. Notify the CharacterController and re-enable collision.
@ -1045,6 +1050,20 @@ namespace MWMechanics
} }
} }
// check if we still have any player enemies to switch music
static bool isBattleMusic = false;
if (isBattleMusic && hostilesCount == 0)
{
MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
isBattleMusic = false;
}
else if (!isBattleMusic && hostilesCount > 0)
{
MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle"));
isBattleMusic = true;
}
// if player is in sneak state see if anyone detects him // if player is in sneak state see if anyone detects him
if (player.getClass().getCreatureStats(player).getMovementFlag(MWMechanics::CreatureStats::Flag_Sneak)) if (player.getClass().getCreatureStats(player).getMovementFlag(MWMechanics::CreatureStats::Flag_Sneak))
{ {

8
apps/openmw/mwmechanics/aicombat.cpp
View file

@ -405,8 +405,6 @@ namespace MWMechanics
} }
else // (within attack dist) else // (within attack dist)
{ {
if (!mAttack) mMovement.mPosition[1] = 0;
if(mMovement.mPosition[0] || mMovement.mPosition[1]) if(mMovement.mPosition[0] || mMovement.mPosition[1])
{ {
mTimerCombatMove = 0.1f + 0.1f * static_cast<float>(rand())/RAND_MAX; mTimerCombatMove = 0.1f + 0.1f * static_cast<float>(rand())/RAND_MAX;
@ -501,6 +499,12 @@ namespace MWMechanics
} }
mMovement.mPosition[1] = 1; mMovement.mPosition[1] = 1;
if (mReadyToAttack)
{
// to stop possible sideway moving after target moved out of attack range
mCombatMove = true;
mTimerCombatMove = 0;
}
mReadyToAttack = false; mReadyToAttack = false;
} }