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

Allow adding multiple Attribute/Skill effects in spell making (Fixes #2224)

Browse source
This commit is contained in:
MiroslavR 2014-12-22 01:54:24 +01:00
parent 73382b8aa4
commit c796589420
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -592,14 +592,6 @@ namespace MWGui
int buttonId = *sender->getUserData<int>(); int buttonId = *sender->getUserData<int>();
mSelectedKnownEffectId = mButtonMapping[buttonId]; mSelectedKnownEffectId = mButtonMapping[buttonId];
for (std::vector<ESM::ENAMstruct>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
{
if (it->mEffectID == mSelectedKnownEffectId)
{
MWBase::Environment::get().getWindowManager()->messageBox ("#{sOnetypeEffectMessage}");
return;
}
}
const ESM::MagicEffect* effect = const ESM::MagicEffect* effect =
MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId); MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
@ -622,6 +614,15 @@ namespace MWGui
} }
else else
{ {
for (std::vector<ESM::ENAMstruct>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
{
if (it->mEffectID == mSelectedKnownEffectId)
{
MWBase::Environment::get().getWindowManager()->messageBox ("#{sOnetypeEffectMessage}");
return;
}
}
mAddEffectDialog.newEffect(effect); mAddEffectDialog.newEffect(effect);
} }
} }