mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-28 14:53:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix iFightAttack and iFightAttacking being swapped

Browse Source 
Looks like the research wiki page was incorrect, the higher value (iFightAttack) being for the victim makes more sense, is consistent with iDispAttackMod/fDispAttacking, and seems to be how the original game behaves as well.
This commit is contained in:
scrawl 2014-12-21 01:53:32 +01:00
parent b35f87ae7e
commit 2410d79410
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View File

@ -1041,8 +1041,8 @@ namespace MWMechanics
} }
else if (type == OT_Assault) else if (type == OT_Assault)
{ {
fight = esmStore.get<ESM::GameSetting>().find("iFightAttack")->getInt(); fight = esmStore.get<ESM::GameSetting>().find("iFightAttacking")->getInt();
fightVictim = esmStore.get<ESM::GameSetting>().find("iFightAttacking")->getInt(); fightVictim = esmStore.get<ESM::GameSetting>().find("iFightAttack")->getInt();
} }
else if (type == OT_Murder) else if (type == OT_Murder)
fight = fightVictim = esmStore.get<ESM::GameSetting>().find("iFightKilling")->getInt(); fight = fightVictim = esmStore.get<ESM::GameSetting>().find("iFightKilling")->getInt();