krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #84 from OpenMW/master

Browse source 
Add OpenMW commits from Oct 25
This commit is contained in:
David Cernat 2016-10-26 15:26:42 +03:00 committed by GitHub
commit 6d61c6cf2d
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.md
View file

@ -27,6 +27,7 @@ Programmers
Artem Kotsynyak (greye) Artem Kotsynyak (greye)
artemutin artemutin
Arthur Moore (EmperorArthur) Arthur Moore (EmperorArthur)
Assumeru
athile athile
Ben Shealy (bentsherman) Ben Shealy (bentsherman)
Bret Curtis (psi29a) Bret Curtis (psi29a)

16
components/esm/loadmgef.cpp
View file

@ -298,10 +298,10 @@ short MagicEffect::getResistanceEffect(short effect)
for (int i=0; i<2; ++i) for (int i=0; i<2; ++i)
{ {
effects[CalmHumanoid] = ResistMagicka; effects[CalmHumanoid+i] = ResistMagicka;
effects[FrenzyHumanoid] = ResistMagicka; effects[FrenzyHumanoid+i] = ResistMagicka;
effects[DemoralizeHumanoid] = ResistMagicka; effects[DemoralizeHumanoid+i] = ResistMagicka;
effects[RallyHumanoid] = ResistMagicka; effects[RallyHumanoid+i] = ResistMagicka;
} }
effects[TurnUndead] = ResistMagicka; effects[TurnUndead] = ResistMagicka;
@ -341,10 +341,10 @@ short MagicEffect::getWeaknessEffect(short effect)
for (int i=0; i<2; ++i) for (int i=0; i<2; ++i)
{ {
effects[CalmHumanoid] = WeaknessToMagicka; effects[CalmHumanoid+i] = WeaknessToMagicka;
effects[FrenzyHumanoid] = WeaknessToMagicka; effects[FrenzyHumanoid+i] = WeaknessToMagicka;
effects[DemoralizeHumanoid] = WeaknessToMagicka; effects[DemoralizeHumanoid+i] = WeaknessToMagicka;
effects[RallyHumanoid] = WeaknessToMagicka; effects[RallyHumanoid+i] = WeaknessToMagicka;
} }
effects[TurnUndead] = WeaknessToMagicka; effects[TurnUndead] = WeaknessToMagicka;