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

Merge pull request #1432 from akortunov/alchemyfix

Browse source 
Update alchemy effects after every created potion (#4079)
This commit is contained in:
scrawl 2017-09-07 20:51:42 +00:00 committed by GitHub
commit 8f1c8759e4
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwmechanics/alchemy.cpp
View file

@ -262,21 +262,15 @@ const ESM::Potion *MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) co
void MWMechanics::Alchemy::removeIngredients() void MWMechanics::Alchemy::removeIngredients()
{ {
bool needsUpdate = false;
for (TIngredientsContainer::iterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter) for (TIngredientsContainer::iterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter)
if (!iter->isEmpty()) if (!iter->isEmpty())
{ {
iter->getContainerStore()->remove(*iter, 1, mAlchemist); iter->getContainerStore()->remove(*iter, 1, mAlchemist);
if (iter->getRefData().getCount()<1) if (iter->getRefData().getCount()<1)
{
needsUpdate = true;
*iter = MWWorld::Ptr(); *iter = MWWorld::Ptr();
} }
}
if (needsUpdate)
updateEffects(); updateEffects();
} }

1
components/widgets/windowcaption.hpp
View file

@ -23,6 +23,7 @@ namespace Gui
private: private:
MyGUI::Widget* mLeft; MyGUI::Widget* mLeft;
MyGUI::Widget* mRight; MyGUI::Widget* mRight;
MyGUI::Widget* mClient;
void align(); void align();
}; };