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

Merge remote-tracking branch 'jordan-ayers/topic/dead-code'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-08-24 15:13:53 +02:00
commit 8f7f29943a
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,5 @@
#include "alchemywindow.hpp" #include "alchemywindow.hpp"
#include <boost/algorithm/string.hpp>
#include <MyGUI_Gui.h> #include <MyGUI_Gui.h>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
@ -67,9 +65,6 @@ namespace MWGui
void AlchemyWindow::onCreateButtonClicked(MyGUI::Widget* _sender) void AlchemyWindow::onCreateButtonClicked(MyGUI::Widget* _sender)
{ {
std::string name = mNameEdit->getCaption();
boost::algorithm::trim(name);
MWMechanics::Alchemy::Result result = mAlchemy->create (mNameEdit->getCaption ()); MWMechanics::Alchemy::Result result = mAlchemy->create (mNameEdit->getCaption ());
if (result == MWMechanics::Alchemy::Result_NoName) if (result == MWMechanics::Alchemy::Result_NoName)
@ -118,7 +113,7 @@ namespace MWGui
MWWorld::Ptr ingred = *mIngredients[i]->getUserData<MWWorld::Ptr>(); MWWorld::Ptr ingred = *mIngredients[i]->getUserData<MWWorld::Ptr>();
if (ingred.getRefData().getCount() == 0) if (ingred.getRefData().getCount() == 0)
removeIngredient(mIngredients[i]); removeIngredient(mIngredients[i]);
} }
update(); update();
} }
@ -136,9 +131,6 @@ namespace MWGui
mNameEdit->setCaption(""); mNameEdit->setCaption("");
int index = 0; int index = 0;
mAlchemy->setAlchemist (MWMechanics::getPlayer());
for (MWMechanics::Alchemy::TToolsIterator iter (mAlchemy->beginTools()); for (MWMechanics::Alchemy::TToolsIterator iter (mAlchemy->beginTools());
iter!=mAlchemy->endTools() && index<static_cast<int> (mApparatus.size()); ++iter, ++index) iter!=mAlchemy->endTools() && index<static_cast<int> (mApparatus.size()); ++iter, ++index)
{ {