mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-31 06:32:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2793 from Capostrophic/distancebias

Browse Source 
Pick the correct aggressive actor in fight distance bias calculation
This commit is contained in:
Bret Curtis 2020-04-23 00:09:36 +02:00 committed by GitHub
commit e791e65684
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwmechanics/combat.cpp
View File

@ -467,7 +467,7 @@ namespace MWMechanics
osg::Vec3f pos1 (actor1.getRefData().getPosition().asVec3()); osg::Vec3f pos1 (actor1.getRefData().getPosition().asVec3());
osg::Vec3f pos2 (actor2.getRefData().getPosition().asVec3()); osg::Vec3f pos2 (actor2.getRefData().getPosition().asVec3());
float d = getAggroDistance(actor2, pos1, pos2); float d = getAggroDistance(actor1, pos1, pos2);
static const int iFightDistanceBase = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find( static const int iFightDistanceBase = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
"iFightDistanceBase")->mValue.getInteger(); "iFightDistanceBase")->mValue.getInteger();