mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-05 15:55:45 +00:00
Code Issues Projects Releases Wiki Activity

Spell creation: do not add skill/attribute effects before selecting the skill or attribute

Browse Source
This commit is contained in:
MiroslavR 2014-08-15 00:30:24 +02:00
parent 93ed019ca3
commit 1385a86bd4
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/openmw/mwgui/spellcreationdialog.cpp
View File

@ -524,16 +524,24 @@ namespace MWGui
void EffectEditorBase::onSelectAttribute ()
{
mAddEffectDialog.setVisible(true);
const ESM::MagicEffect* effect =
MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
mAddEffectDialog.newEffect(effect);
mAddEffectDialog.setAttribute (mSelectAttributeDialog->getAttributeId());
mAddEffectDialog.setVisible(true);
MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectAttributeDialog);
mSelectAttributeDialog = 0;
}
void EffectEditorBase::onSelectSkill ()
{
const ESM::MagicEffect* effect =
MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
mAddEffectDialog.newEffect(effect);
mAddEffectDialog.setSkill (mSelectSkillDialog->getSkillId());
mAddEffectDialog.setVisible(true);
mAddEffectDialog.setSkill (mSelectSkillDialog->getSkillId ());
MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectSkillDialog);
mSelectSkillDialog = 0;
}
@ -558,11 +566,10 @@ namespace MWGui
}
int buttonId = *sender->getUserData<int>();
short effectId = mButtonMapping[buttonId];
mSelectedKnownEffectId = mButtonMapping[buttonId];
for (std::vector<ESM::ENAMstruct>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
{
if (it->mEffectID == effectId)
if (it->mEffectID == mSelectedKnownEffectId)
{
MWBase::Environment::get().getWindowManager()->messageBox ("#{sOnetypeEffectMessage}");
return;
@ -570,9 +577,7 @@ namespace MWGui
}
const ESM::MagicEffect* effect =
MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
mAddEffectDialog.newEffect (effect);
MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
if (effect->mData.mFlags & ESM::MagicEffect::TargetSkill)
{
@ -592,6 +597,7 @@ namespace MWGui
}
else
{
mAddEffectDialog.newEffect(effect);
mAddEffectDialog.setVisible(true);
}
}

1
apps/openmw/mwgui/spellcreationdialog.hpp
View File

@ -99,6 +99,7 @@ namespace MWGui
SelectSkillDialog* mSelectSkillDialog;
int mSelectedEffect;
short mSelectedKnownEffectId;
std::vector<ESM::ENAMstruct> mEffects;