Merge pull request #84 from OpenMW/master

Add OpenMW commits from Oct 25

AUTHORS.md

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

components/esm/loadmgef.cpp

@@ -298,10 +298,10 @@ short MagicEffect::getResistanceEffect(short effect)
 
     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;
@@ -341,10 +341,10 @@ short MagicEffect::getWeaknessEffect(short effect)
 
     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;