AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-23 04:26:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix(Client): Correctly play combat music (#29)

Browse Source 
* Fix(Client): Correctly play combat music

* Cleanup(actors.cpp): Reformat conditionals
This commit is contained in:
Dave Corley 2023-10-08 13:32:16 -05:00 committed by Dave Corley
parent ecb053863b
commit cc78be5982
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/openmw/mwmechanics/actors.cpp
View File

@ -1860,24 +1860,19 @@ namespace MWMechanics
MWWorld::Ptr player = getPlayer(); MWWorld::Ptr player = getPlayer();
const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3(); const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
bool hasHostiles = false; // need to know this to play Battle music bool hasHostiles = false; // need to know this to play Battle music
bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
if (aiActive) for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
{ {
for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter) if (iter->first == player) continue;
{
if (iter->first == player) continue;
bool inProcessingRange = (playerPos - iter->first.getRefData().getPosition().asVec3()).length2() <= mActorsProcessingRange*mActorsProcessingRange; bool inProcessingRange = (playerPos - iter->first.getRefData().getPosition().asVec3()).length2() <= mActorsProcessingRange*mActorsProcessingRange;
if (inProcessingRange) if (!inProcessingRange) continue;
{
MWMechanics::CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first); MWMechanics::CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
if (!stats.isDead() && stats.getAiSequence().isInCombat()) if (!stats.isDead() && stats.getAiSequence().isInCombat())
{ {
hasHostiles = true; hasHostiles = true;
break; break;
}
}
} }
} }