mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
use std::distance
This commit is contained in:
parent
6d0dceae34
commit
60711cedb0
@ -333,14 +333,7 @@ namespace MWGui
|
|||||||
if (_sender->getUserData<MWWorld::Ptr>()->isEmpty()) // if this apparatus slot is empty
|
if (_sender->getUserData<MWWorld::Ptr>()->isEmpty()) // if this apparatus slot is empty
|
||||||
{
|
{
|
||||||
std::string title;
|
std::string title;
|
||||||
|
size_t i = std::distance(mApparatus.begin(), std::find(mApparatus.begin(), mApparatus.end(), _sender));
|
||||||
size_t i = 0;
|
|
||||||
for (; i < mApparatus.size(); ++i)
|
|
||||||
{
|
|
||||||
if (mApparatus[i] == _sender)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (i)
|
switch (i)
|
||||||
{
|
{
|
||||||
case ESM::Apparatus::AppaType::MortarPestle:
|
case ESM::Apparatus::AppaType::MortarPestle:
|
||||||
@ -468,7 +461,7 @@ namespace MWGui
|
|||||||
|
|
||||||
void AlchemyWindow::removeIngredient(MyGUI::Widget* ingredient)
|
void AlchemyWindow::removeIngredient(MyGUI::Widget* ingredient)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 4; ++i)
|
for (int i = 0; i < mIngredients.size(); ++i)
|
||||||
if (mIngredients[i] == ingredient)
|
if (mIngredients[i] == ingredient)
|
||||||
mAlchemy->removeIngredient(i);
|
mAlchemy->removeIngredient(i);
|
||||||
|
|
||||||
@ -479,19 +472,18 @@ namespace MWGui
|
|||||||
{
|
{
|
||||||
for (size_t i = 0; i < mApparatus.size(); ++i)
|
for (size_t i = 0; i < mApparatus.size(); ++i)
|
||||||
{
|
{
|
||||||
const auto& widget = mApparatus[i];
|
if (mApparatus[i] == apparatus)
|
||||||
if (widget == apparatus)
|
|
||||||
{
|
{
|
||||||
|
const auto& widget = mApparatus[i];
|
||||||
mAlchemy->removeApparatus(i);
|
mAlchemy->removeApparatus(i);
|
||||||
|
|
||||||
if (widget->getChildCount())
|
if (widget->getChildCount())
|
||||||
MyGUI::Gui::getInstance().destroyWidget(widget->getChildAt(0));
|
MyGUI::Gui::getInstance().destroyWidget(widget->getChildAt(0));
|
||||||
|
|
||||||
widget->clearUserStrings();
|
widget->clearUserStrings();
|
||||||
|
|
||||||
widget->setItem(MWWorld::Ptr());
|
widget->setItem(MWWorld::Ptr());
|
||||||
|
|
||||||
widget->setUserData(MWWorld::Ptr());
|
widget->setUserData(MWWorld::Ptr());
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user