mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 10:36:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request from Capostrophic/enchanting

Browse source 
Enchanting window stays open after a failed attempt (feature )
This commit is contained in:
Andrei Kortunov 2019-05-14 19:49:09 +04:00 committed by GitHub
commit 5266520e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

1
CHANGELOG.md
View file

@ -115,6 +115,7 @@
Feature #5010: Native graphics herbalism support Feature #5010: Native graphics herbalism support
Feature #5031: Make GetWeaponType function return different values for tools Feature #5031: Make GetWeaponType function return different values for tools
Feature #5033: Magic armor mitigation for creatures Feature #5033: Magic armor mitigation for creatures
Feature #5034: Make enchanting window stay open after a failed attempt
Feature #5036: Allow scripted faction leaving Feature #5036: Allow scripted faction leaving
Task #4686: Upgrade media decoder to a more current FFmpeg API Task #4686: Upgrade media decoder to a more current FFmpeg API
Task #4695: Optimize Distant Terrain memory consumption Task #4695: Optimize Distant Terrain memory consumption

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

@ -366,13 +366,19 @@ namespace MWGui
{ {
MWBase::Environment::get().getWindowManager()->playSound("enchant success"); MWBase::Environment::get().getWindowManager()->playSound("enchant success");
MWBase::Environment::get().getWindowManager()->messageBox ("#{sEnchantmentMenu12}"); MWBase::Environment::get().getWindowManager()->messageBox ("#{sEnchantmentMenu12}");
MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Enchanting);
} }
else else
{ {
MWBase::Environment::get().getWindowManager()->playSound("enchant fail"); MWBase::Environment::get().getWindowManager()->playSound("enchant fail");
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage34}"); MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage34}");
if (!mEnchanting.getGem().isEmpty() && !mEnchanting.getGem().getRefData().getCount())
{
setSoulGem(MWWorld::Ptr());
mEnchanting.nextCastStyle();
updateLabels();
updateEffectsView();
}
} }
MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Enchanting);
} }
} }