mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-07-08 06:41:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'jfmherokiller-master-patch-23743' into 'master'

Browse source 
Fix the regression involving Cure

See merge request OpenMW/openmw!582
This commit is contained in:
psi29a 2021-02-06 15:41:24 +00:00
commit e6607486f5
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.md
View file

@ -215,6 +215,7 @@ Programmers
Yohaulticetl Yohaulticetl
Yuri Krupenin Yuri Krupenin
zelurker zelurker
Noah Gooder
Documentation Documentation
------------- -------------

10
apps/openmw/mwmechanics/actors.cpp
View file

@ -951,29 +951,29 @@ namespace MWMechanics
if (actor.getClass().hasInventoryStore(actor)) if (actor.getClass().hasInventoryStore(actor))
actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Poison); actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Poison);
} }
else if (effects.get(ESM::MagicEffect::CureParalyzation).getModifier() > 0) if (effects.get(ESM::MagicEffect::CureParalyzation).getModifier() > 0)
{ {
creatureStats.getActiveSpells().purgeEffect(ESM::MagicEffect::Paralyze); creatureStats.getActiveSpells().purgeEffect(ESM::MagicEffect::Paralyze);
creatureStats.getSpells().purgeEffect(ESM::MagicEffect::Paralyze); creatureStats.getSpells().purgeEffect(ESM::MagicEffect::Paralyze);
if (actor.getClass().hasInventoryStore(actor)) if (actor.getClass().hasInventoryStore(actor))
actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Paralyze); actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Paralyze);
} }
else if (effects.get(ESM::MagicEffect::CureCommonDisease).getModifier() > 0) if (effects.get(ESM::MagicEffect::CureCommonDisease).getModifier() > 0)
{ {
creatureStats.getSpells().purgeCommonDisease(); creatureStats.getSpells().purgeCommonDisease();
} }
else if (effects.get(ESM::MagicEffect::CureBlightDisease).getModifier() > 0) if (effects.get(ESM::MagicEffect::CureBlightDisease).getModifier() > 0)
{ {
creatureStats.getSpells().purgeBlightDisease(); creatureStats.getSpells().purgeBlightDisease();
} }
else if (effects.get(ESM::MagicEffect::CureCorprusDisease).getModifier() > 0) if (effects.get(ESM::MagicEffect::CureCorprusDisease).getModifier() > 0)
{ {
creatureStats.getActiveSpells().purgeCorprusDisease(); creatureStats.getActiveSpells().purgeCorprusDisease();
creatureStats.getSpells().purgeCorprusDisease(); creatureStats.getSpells().purgeCorprusDisease();
if (actor.getClass().hasInventoryStore(actor)) if (actor.getClass().hasInventoryStore(actor))
actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Corprus, true); actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Corprus, true);
} }
else if (effects.get(ESM::MagicEffect::RemoveCurse).getModifier() > 0) if (effects.get(ESM::MagicEffect::RemoveCurse).getModifier() > 0)
{ {
creatureStats.getSpells().purgeCurses(); creatureStats.getSpells().purgeCurses();
} }