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

Finished enchanting

Browse source
This commit is contained in:
Glorf 2013-04-03 18:02:30 +02:00
parent 7b7d3353a6
commit ae3e4ecf8b
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwgui/enchantingdialog.cpp
View file

@ -32,6 +32,7 @@ namespace MWGui
getWidget(mTypeButton, "TypeButton"); getWidget(mTypeButton, "TypeButton");
getWidget(mBuyButton, "BuyButton"); getWidget(mBuyButton, "BuyButton");
getWidget(mPrice, "PriceLabel"); getWidget(mPrice, "PriceLabel");
getWidget(mPriceText, "PriceTextLabel");
setWidgets(mAvailableEffectsList, mUsedEffectsView); setWidgets(mAvailableEffectsList, mUsedEffectsView);
@ -94,19 +95,34 @@ namespace MWGui
mPtr = actor; mPtr = actor;
startEditing (); startEditing ();
mPrice->setVisible(true);
} }
void EnchantingDialog::startSelfEnchanting(MWWorld::Ptr soulgem) void EnchantingDialog::startSelfEnchanting(MWWorld::Ptr soulgem)
{ {
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
MWWorld::Ptr gem = soulgem;
mEnchanting.setSelfEnchanting(true); mEnchanting.setSelfEnchanting(true);
mEnchanting.setEnchanter(player); mEnchanting.setEnchanter(player);
mPtr = player; mPtr = player;
startEditing(); startEditing();
mEnchanting.setSoulGem(gem); mEnchanting.setSoulGem(soulgem);
MyGUI::ImageBox* image = mSoulBox->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(0, 0, 32, 32), MyGUI::Align::Default);
std::string path = std::string("icons\\");
path += MWWorld::Class::get(soulgem).getInventoryIcon(soulgem);
int pos = path.rfind(".");
path.erase(pos);
path.append(".dds");
image->setImageTexture (path);
image->setUserString ("ToolTipType", "ItemPtr");
image->setUserData(soulgem);
image->eventMouseButtonClick += MyGUI::newDelegate(this, &EnchantingDialog::onRemoveSoul);
mPrice->setVisible(false);
mPriceText->setVisible(false);
} }
void EnchantingDialog::onReferenceUnavailable () void EnchantingDialog::onReferenceUnavailable ()

1
apps/openmw/mwgui/enchantingdialog.hpp
View file

@ -56,6 +56,7 @@ namespace MWGui
MyGUI::TextBox* mCastCost; MyGUI::TextBox* mCastCost;
MyGUI::TextBox* mCharge; MyGUI::TextBox* mCharge;
MyGUI::TextBox* mPrice; MyGUI::TextBox* mPrice;
MyGUI::TextBox* mPriceText;
MWMechanics::Enchanting mEnchanting; MWMechanics::Enchanting mEnchanting;
ESM::EffectList mEffectList; ESM::EffectList mEffectList;

1
apps/openmw/mwmechanics/enchanting.cpp
View file

@ -88,6 +88,7 @@ namespace MWMechanics
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
MWWorld::Class::get (player).getContainerStore (player).add (ref.getPtr()); MWWorld::Class::get (player).getContainerStore (player).add (ref.getPtr());
if(!mSelfEnchanting)
payForEnchantment(); payForEnchantment();
return true; return true;

4
files/mygui/openmw_enchanting_dialog.layout
View file

@ -97,11 +97,11 @@
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
</Widget> </Widget>
<Widget type="AutoSizedTextBox" skin="NormalText"> <Widget type="AutoSizedTextBox" skin="NormalText" name="PriceTextLabel">
<Property key="Caption" value="#{sBarterDialog7}"/> <Property key="Caption" value="#{sBarterDialog7}"/>
</Widget> </Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="PriceLabel"> <Widget type="AutoSizedTextBox" skin="SandText" name="PriceLabel">
<Property key="Caption" value="30"/> <Property key="Caption" value="0"/>
</Widget> </Widget>