mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-27 12:11:35 +00:00
Code Issues Releases Wiki Activity

Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI

Browse source
This commit is contained in:
Marc Zinnschlag 2012-10-02 10:29:47 +02:00
parent 14833a4c3a
commit 332039da10
2 changed files with 44 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
apps/openmw/mwgui/alchemywindow.cpp
View file

@ -28,14 +28,14 @@ namespace MWGui
{ {
AlchemyWindow::AlchemyWindow(MWBase::WindowManager& parWindowManager) AlchemyWindow::AlchemyWindow(MWBase::WindowManager& parWindowManager)
: WindowBase("openmw_alchemy_window.layout", parWindowManager) : WindowBase("openmw_alchemy_window.layout", parWindowManager)
, ContainerBase(0), mApparatus (4) , ContainerBase(0), mApparatus (4), mIngredients (4)
{ {
getWidget(mCreateButton, "CreateButton"); getWidget(mCreateButton, "CreateButton");
getWidget(mCancelButton, "CancelButton"); getWidget(mCancelButton, "CancelButton");
getWidget(mIngredient1, "Ingredient1"); getWidget(mIngredients[0], "Ingredient1");
getWidget(mIngredient2, "Ingredient2"); getWidget(mIngredients[1], "Ingredient2");
getWidget(mIngredient3, "Ingredient3"); getWidget(mIngredients[2], "Ingredient3");
getWidget(mIngredient4, "Ingredient4"); getWidget(mIngredients[3], "Ingredient4");
getWidget(mApparatus[0], "Apparatus1"); getWidget(mApparatus[0], "Apparatus1");
getWidget(mApparatus[1], "Apparatus2"); getWidget(mApparatus[1], "Apparatus2");
getWidget(mApparatus[2], "Apparatus3"); getWidget(mApparatus[2], "Apparatus3");
@ -43,10 +43,10 @@ namespace MWGui
getWidget(mEffectsBox, "CreatedEffects"); getWidget(mEffectsBox, "CreatedEffects");
getWidget(mNameEdit, "NameEdit"); getWidget(mNameEdit, "NameEdit");
mIngredient1->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected); mIngredients[0]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
mIngredient2->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected); mIngredients[1]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
mIngredient3->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected); mIngredients[2]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
mIngredient4->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected); mIngredients[3]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
mCreateButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCreateButtonClicked); mCreateButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCreateButtonClicked);
mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCancelButtonClicked); mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCancelButtonClicked);
@ -80,14 +80,10 @@ namespace MWGui
// make sure 2 or more ingredients were selected // make sure 2 or more ingredients were selected
int numIngreds = 0; int numIngreds = 0;
if (mIngredient1->isUserString("ToolTipType")) for (int i=0; i<4; ++i)
++numIngreds; if (mIngredients[i]->isUserString("ToolTipType"))
if (mIngredient2->isUserString("ToolTipType")) ++numIngreds;
++numIngreds;
if (mIngredient3->isUserString("ToolTipType"))
++numIngreds;
if (mIngredient4->isUserString("ToolTipType"))
++numIngreds;
if (numIngreds < 2) if (numIngreds < 2)
{ {
mWindowManager.messageBox("#{sNotifyMessage6a}", std::vector<std::string>()); mWindowManager.messageBox("#{sNotifyMessage6a}", std::vector<std::string>());
@ -138,14 +134,9 @@ namespace MWGui
// note by scrawl: not rounding down here, I can't imagine a created potion to // note by scrawl: not rounding down here, I can't imagine a created potion to
// have 0 weight when using ingredients with 0.1 weight respectively // have 0 weight when using ingredients with 0.1 weight respectively
float weight = 0; float weight = 0;
if (mIngredient1->isUserString("ToolTipType")) for (int i=0; i<4; ++i)
weight += mIngredient1->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight; if (mIngredients[i]->isUserString("ToolTipType"))
if (mIngredient2->isUserString("ToolTipType")) weight += mIngredients[i]->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight;
weight += mIngredient2->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight;
if (mIngredient3->isUserString("ToolTipType"))
weight += mIngredient3->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight;
if (mIngredient4->isUserString("ToolTipType"))
weight += mIngredient4->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight;
newPotion.mData.mWeight = weight / float(numIngreds); newPotion.mData.mWeight = weight / float(numIngreds);
newPotion.mData.mValue = 100; /// \todo newPotion.mData.mValue = 100; /// \todo
@ -222,34 +213,15 @@ namespace MWGui
} }
// reduce count of the ingredients // reduce count of the ingredients
if (mIngredient1->isUserString("ToolTipType")) for (int i=0; i<4; ++i)
{ if (mIngredients[i]->isUserString("ToolTipType"))
MWWorld::Ptr ingred = *mIngredient1->getUserData<MWWorld::Ptr>(); {
ingred.getRefData().setCount(ingred.getRefData().getCount()-1); MWWorld::Ptr ingred = *mIngredients[i]->getUserData<MWWorld::Ptr>();
if (ingred.getRefData().getCount() == 0) ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
removeIngredient(mIngredient1); if (ingred.getRefData().getCount() == 0)
} removeIngredient(mIngredients[i]);
if (mIngredient2->isUserString("ToolTipType"))
{
MWWorld::Ptr ingred = *mIngredient2->getUserData<MWWorld::Ptr>();
ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
if (ingred.getRefData().getCount() == 0)
removeIngredient(mIngredient2);
}
if (mIngredient3->isUserString("ToolTipType"))
{
MWWorld::Ptr ingred = *mIngredient3->getUserData<MWWorld::Ptr>();
ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
if (ingred.getRefData().getCount() == 0)
removeIngredient(mIngredient3);
}
if (mIngredient4->isUserString("ToolTipType"))
{
MWWorld::Ptr ingred = *mIngredient4->getUserData<MWWorld::Ptr>();
ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
if (ingred.getRefData().getCount() == 0)
removeIngredient(mIngredient4);
} }
update(); update();
} }
@ -289,45 +261,24 @@ namespace MWGui
// (which could happen if two similiar ingredients don't stack because of script / owner) // (which could happen if two similiar ingredients don't stack because of script / owner)
bool alreadyAdded = false; bool alreadyAdded = false;
std::string name = MWWorld::Class::get(item).getName(item); std::string name = MWWorld::Class::get(item).getName(item);
if (mIngredient1->isUserString("ToolTipType")) for (int i=0; i<4; ++i)
{ if (mIngredients[i]->isUserString("ToolTipType"))
MWWorld::Ptr item2 = *mIngredient1->getUserData<MWWorld::Ptr>(); {
std::string name2 = MWWorld::Class::get(item2).getName(item2); MWWorld::Ptr item2 = *mIngredients[i]->getUserData<MWWorld::Ptr>();
if (name == name2) std::string name2 = MWWorld::Class::get(item2).getName(item2);
alreadyAdded = true; if (name == name2)
} alreadyAdded = true;
if (mIngredient2->isUserString("ToolTipType")) }
{
MWWorld::Ptr item2 = *mIngredient2->getUserData<MWWorld::Ptr>();
std::string name2 = MWWorld::Class::get(item2).getName(item2);
if (name == name2)
alreadyAdded = true;
}
if (mIngredient3->isUserString("ToolTipType"))
{
MWWorld::Ptr item2 = *mIngredient3->getUserData<MWWorld::Ptr>();
std::string name2 = MWWorld::Class::get(item2).getName(item2);
if (name == name2)
alreadyAdded = true;
}
if (mIngredient4->isUserString("ToolTipType"))
{
MWWorld::Ptr item2 = *mIngredient4->getUserData<MWWorld::Ptr>();
std::string name2 = MWWorld::Class::get(item2).getName(item2);
if (name == name2)
alreadyAdded = true;
}
if (alreadyAdded) if (alreadyAdded)
return; return;
if (!mIngredient1->isUserString("ToolTipType")) for (int i=0; i<4; ++i)
add = mIngredient1; if (!mIngredients[i]->isUserString("ToolTipType"))
if (add == NULL && !mIngredient2->isUserString("ToolTipType")) {
add = mIngredient2; add = mIngredients[i];
if (add == NULL && !mIngredient3->isUserString("ToolTipType")) break;
add = mIngredient3; }
if (add == NULL && !mIngredient4->isUserString("ToolTipType"))
add = mIngredient4;
if (add != NULL) if (add != NULL)
{ {
@ -346,14 +297,9 @@ namespace MWGui
{ {
std::vector<MWWorld::Ptr> ignore; std::vector<MWWorld::Ptr> ignore;
// don't show ingredients that are currently selected in the "available ingredients" box. // don't show ingredients that are currently selected in the "available ingredients" box.
if (mIngredient1->isUserString("ToolTipType")) for (int i=0; i<4; ++i)
ignore.push_back(*mIngredient1->getUserData<MWWorld::Ptr>()); if (mIngredients[i]->isUserString("ToolTipType"))
if (mIngredient2->isUserString("ToolTipType")) ignore.push_back(*mIngredients[i]->getUserData<MWWorld::Ptr>());
ignore.push_back(*mIngredient2->getUserData<MWWorld::Ptr>());
if (mIngredient3->isUserString("ToolTipType"))
ignore.push_back(*mIngredient3->getUserData<MWWorld::Ptr>());
if (mIngredient4->isUserString("ToolTipType"))
ignore.push_back(*mIngredient4->getUserData<MWWorld::Ptr>());
return ignore; return ignore;
} }
@ -364,15 +310,7 @@ namespace MWGui
for (int i=0; i<4; ++i) for (int i=0; i<4; ++i)
{ {
MyGUI::ImageBox* ingredient; MyGUI::ImageBox* ingredient = mIngredients[i];
if (i==0)
ingredient = mIngredient1;
else if (i==1)
ingredient = mIngredient2;
else if (i==2)
ingredient = mIngredient3;
else if (i==3)
ingredient = mIngredient4;
if (!ingredient->isUserString("ToolTipType")) if (!ingredient->isUserString("ToolTipType"))
continue; continue;

6
apps/openmw/mwgui/alchemywindow.hpp
View file

@ -22,11 +22,6 @@ namespace MWGui
MyGUI::Button* mCreateButton; MyGUI::Button* mCreateButton;
MyGUI::Button* mCancelButton; MyGUI::Button* mCancelButton;
MyGUI::ImageBox* mIngredient1;
MyGUI::ImageBox* mIngredient2;
MyGUI::ImageBox* mIngredient3;
MyGUI::ImageBox* mIngredient4;
MyGUI::Widget* mEffectsBox; MyGUI::Widget* mEffectsBox;
MyGUI::EditBox* mNameEdit; MyGUI::EditBox* mNameEdit;
@ -51,6 +46,7 @@ namespace MWGui
MWMechanics::Alchemy mAlchemy; MWMechanics::Alchemy mAlchemy;
std::vector<MyGUI::ImageBox *> mApparatus; std::vector<MyGUI::ImageBox *> mApparatus;
std::vector<MyGUI::ImageBox *> mIngredients;
}; };
} }