From fc06dc72c9f94774851452747d0993b6722c39ed Mon Sep 17 00:00:00 2001 From: scrawl Date: Mon, 30 Apr 2012 18:20:44 +0200 Subject: [PATCH] small fix --- apps/openmw/mwgui/widgets.cpp | 120 +++++++++++++++++----------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp index 0af035d31..3c7f33ecd 100644 --- a/apps/openmw/mwgui/widgets.cpp +++ b/apps/openmw/mwgui/widgets.cpp @@ -588,22 +588,22 @@ bool MWSpellEffect::effectHasDuration(const std::string& effect) // lists effects that have no duration (e.g. open lock) std::vector effectsWithoutDuration; effectsWithoutDuration.push_back("sEffectOpen"); - effectsWithoutDuration.push_back("sOpen"); - effectsWithoutDuration.push_back("sLock"); - effectsWithoutDuration.push_back("sDispel"); - effectsWithoutDuration.push_back("sSunDamage"); - effectsWithoutDuration.push_back("sCorprus"); - effectsWithoutDuration.push_back("sVampirism"); - effectsWithoutDuration.push_back("sMark"); - effectsWithoutDuration.push_back("sRecall"); - effectsWithoutDuration.push_back("sDivineIntervention"); - effectsWithoutDuration.push_back("sAlmsiviIntervention"); - effectsWithoutDuration.push_back("sCureCommonDisease"); - effectsWithoutDuration.push_back("sCureBlightDisease"); - effectsWithoutDuration.push_back("sCureCorprusDisease"); - effectsWithoutDuration.push_back("sCurePoison"); - effectsWithoutDuration.push_back("sCureParalyzation"); - effectsWithoutDuration.push_back("sRemoveCurse"); + effectsWithoutDuration.push_back("sEffectLock"); + effectsWithoutDuration.push_back("sEffectDispel"); + effectsWithoutDuration.push_back("sEffectSunDamage"); + effectsWithoutDuration.push_back("sEffectCorpus"); + effectsWithoutDuration.push_back("sEffectVampirism"); + effectsWithoutDuration.push_back("sEffectMark"); + effectsWithoutDuration.push_back("sEffectRecall"); + effectsWithoutDuration.push_back("sEffectDivineIntervention"); + effectsWithoutDuration.push_back("sEffectAlmsiviIntervention"); + effectsWithoutDuration.push_back("sEffectCureCommonDisease"); + effectsWithoutDuration.push_back("sEffectCureBlightDisease"); + effectsWithoutDuration.push_back("sEffectCureCorprusDisease"); + effectsWithoutDuration.push_back("sEffectCurePoison"); + effectsWithoutDuration.push_back("sEffectCureParalyzation"); + effectsWithoutDuration.push_back("sEffectRemoveCurse"); + effectsWithoutDuration.push_back("sEffectRestoreAttribute"); return (std::find(effectsWithoutDuration.begin(), effectsWithoutDuration.end(), effect) == effectsWithoutDuration.end()); } @@ -615,50 +615,50 @@ bool MWSpellEffect::effectHasMagnitude(const std::string& effect) effectsWithoutMagnitude.push_back("sEffectInvisibility"); effectsWithoutMagnitude.push_back("sEffectStuntedMagicka"); effectsWithoutMagnitude.push_back("sEffectParalyze"); - effectsWithoutMagnitude.push_back("sSoultrap"); - effectsWithoutMagnitude.push_back("sSilence"); - effectsWithoutMagnitude.push_back("sParalyze"); - effectsWithoutMagnitude.push_back("sInvisibility"); - effectsWithoutMagnitude.push_back("sWaterWalking"); - effectsWithoutMagnitude.push_back("sWaterBreathing"); - effectsWithoutMagnitude.push_back("sSummonScamp"); - effectsWithoutMagnitude.push_back("sSummonClannfear"); - effectsWithoutMagnitude.push_back("sSummonDaedroth"); - effectsWithoutMagnitude.push_back("sSummonDremora"); - effectsWithoutMagnitude.push_back("sSummonAncestralGhost"); - effectsWithoutMagnitude.push_back("sSummonSkeletalMinion"); - effectsWithoutMagnitude.push_back("sSummonBonewalker"); - effectsWithoutMagnitude.push_back("sSummonGreaterBonewalker"); - effectsWithoutMagnitude.push_back("sSummonBonelord"); - effectsWithoutMagnitude.push_back("sSummonWingedTwilight"); - effectsWithoutMagnitude.push_back("sSummonHunger"); - effectsWithoutMagnitude.push_back("sSummonGoldenSaint"); - effectsWithoutMagnitude.push_back("sSummonFlameAtronach"); - effectsWithoutMagnitude.push_back("sSummonFrostAtronach"); - effectsWithoutMagnitude.push_back("sSummonStormAtronach"); - effectsWithoutMagnitude.push_back("sSummonCenturionSphere"); - effectsWithoutMagnitude.push_back("sBoundDagger"); - effectsWithoutMagnitude.push_back("sBoundLongsword"); - effectsWithoutMagnitude.push_back("sBoundMace"); - effectsWithoutMagnitude.push_back("sBoundBattleAxe"); - effectsWithoutMagnitude.push_back("sBoundSpear"); - effectsWithoutMagnitude.push_back("sBoundLongbow"); - effectsWithoutMagnitude.push_back("sBoundCuirass"); - effectsWithoutMagnitude.push_back("sBoundHelm"); - effectsWithoutMagnitude.push_back("sBoundBoots"); - effectsWithoutMagnitude.push_back("sBoundShield"); - effectsWithoutMagnitude.push_back("sBoundGloves"); - effectsWithoutMagnitude.push_back("sStuntedMagicka"); - effectsWithoutMagnitude.push_back("sMark"); - effectsWithoutMagnitude.push_back("sRecall"); - effectsWithoutMagnitude.push_back("sDivineIntervention"); - effectsWithoutMagnitude.push_back("sAlmsiviIntervention"); - effectsWithoutMagnitude.push_back("sCureCommonDisease"); - effectsWithoutMagnitude.push_back("sCureBlightDisease"); - effectsWithoutMagnitude.push_back("sCureCorprusDisease"); - effectsWithoutMagnitude.push_back("sCurePoison"); - effectsWithoutMagnitude.push_back("sCureParalyzation"); - effectsWithoutMagnitude.push_back("sRemoveCurse"); + effectsWithoutMagnitude.push_back("sEffectSoultrap"); + effectsWithoutMagnitude.push_back("sEffectSilence"); + effectsWithoutMagnitude.push_back("sEffectParalyze"); + effectsWithoutMagnitude.push_back("sEffectInvisibility"); + effectsWithoutMagnitude.push_back("sEffectWaterWalking"); + effectsWithoutMagnitude.push_back("sEffectWaterBreathing"); + effectsWithoutMagnitude.push_back("sEffectSummonScamp"); + effectsWithoutMagnitude.push_back("sEffectSummonClannfear"); + effectsWithoutMagnitude.push_back("sEffectSummonDaedroth"); + effectsWithoutMagnitude.push_back("sEffectSummonDremora"); + effectsWithoutMagnitude.push_back("sEffectSummonAncestralGhost"); + effectsWithoutMagnitude.push_back("sEffectSummonSkeletalMinion"); + effectsWithoutMagnitude.push_back("sEffectSummonBonewalker"); + effectsWithoutMagnitude.push_back("sEffectSummonGreaterBonewalker"); + effectsWithoutMagnitude.push_back("sEffectSummonBonelord"); + effectsWithoutMagnitude.push_back("sEffectSummonWingedTwilight"); + effectsWithoutMagnitude.push_back("sEffectSummonHunger"); + effectsWithoutMagnitude.push_back("sEffectSummonGoldenSaint"); + effectsWithoutMagnitude.push_back("sEffectSummonFlameAtronach"); + effectsWithoutMagnitude.push_back("sEffectSummonFrostAtronach"); + effectsWithoutMagnitude.push_back("sEffectSummonStormAtronach"); + effectsWithoutMagnitude.push_back("sEffectSummonCenturionSphere"); + effectsWithoutMagnitude.push_back("sEffectBoundDagger"); + effectsWithoutMagnitude.push_back("sEffectBoundLongsword"); + effectsWithoutMagnitude.push_back("sEffectBoundMace"); + effectsWithoutMagnitude.push_back("sEffectBoundBattleAxe"); + effectsWithoutMagnitude.push_back("sEffectBoundSpear"); + effectsWithoutMagnitude.push_back("sEffectBoundLongbow"); + effectsWithoutMagnitude.push_back("sEffectBoundCuirass"); + effectsWithoutMagnitude.push_back("sEffectBoundHelm"); + effectsWithoutMagnitude.push_back("sEffectBoundBoots"); + effectsWithoutMagnitude.push_back("sEffectBoundShield"); + effectsWithoutMagnitude.push_back("sEffectBoundGloves"); + effectsWithoutMagnitude.push_back("sEffectStuntedMagicka"); + effectsWithoutMagnitude.push_back("sEffectMark"); + effectsWithoutMagnitude.push_back("sEffectRecall"); + effectsWithoutMagnitude.push_back("sEffectDivineIntervention"); + effectsWithoutMagnitude.push_back("sEffectAlmsiviIntervention"); + effectsWithoutMagnitude.push_back("sEffectCureCommonDisease"); + effectsWithoutMagnitude.push_back("sEffectCureBlightDisease"); + effectsWithoutMagnitude.push_back("sEffectCureCorprusDisease"); + effectsWithoutMagnitude.push_back("sEffectCurePoison"); + effectsWithoutMagnitude.push_back("sEffectCureParalyzation"); + effectsWithoutMagnitude.push_back("sEffectRemoveCurse"); return (std::find(effectsWithoutMagnitude.begin(), effectsWithoutMagnitude.end(), effect) == effectsWithoutMagnitude.end()); }