mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-20 07:23:51 +00:00
Merged pull request #1914
This commit is contained in:
commit
252ed9bd4b
2 changed files with 6 additions and 2 deletions
|
@ -146,6 +146,7 @@
|
||||||
Feature #4625: Weapon priority: use weighted mean for melee damage rating
|
Feature #4625: Weapon priority: use weighted mean for melee damage rating
|
||||||
Feature #4626: Weapon priority: account for weapon speed
|
Feature #4626: Weapon priority: account for weapon speed
|
||||||
Feature #4632: AI priority: utilize vanilla AI GMSTs for priority rating
|
Feature #4632: AI priority: utilize vanilla AI GMSTs for priority rating
|
||||||
|
Feature #4636: Use sTo GMST in spellmaking menu
|
||||||
Task #2490: Don't open command prompt window on Release-mode builds automatically
|
Task #2490: Don't open command prompt window on Release-mode builds automatically
|
||||||
Task #4545: Enable is_pod string test
|
Task #4545: Enable is_pod string test
|
||||||
Task #4605: Optimize skinning
|
Task #4605: Optimize skinning
|
||||||
|
|
|
@ -147,7 +147,9 @@ namespace MWGui
|
||||||
|
|
||||||
mDurationValue->setCaption("1");
|
mDurationValue->setCaption("1");
|
||||||
mMagnitudeMinValue->setCaption("1");
|
mMagnitudeMinValue->setCaption("1");
|
||||||
mMagnitudeMaxValue->setCaption("- 1");
|
const std::string to = MWBase::Environment::get().getWindowManager()->getGameSettingString("sTo", "-");
|
||||||
|
|
||||||
|
mMagnitudeMaxValue->setCaption(to + " 1");
|
||||||
mAreaValue->setCaption("0");
|
mAreaValue->setCaption("0");
|
||||||
|
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
|
@ -312,8 +314,9 @@ namespace MWGui
|
||||||
}
|
}
|
||||||
|
|
||||||
mEffect.mMagnMax = pos+1;
|
mEffect.mMagnMax = pos+1;
|
||||||
|
const std::string to = MWBase::Environment::get().getWindowManager()->getGameSettingString("sTo", "-");
|
||||||
|
|
||||||
mMagnitudeMaxValue->setCaption("- " + MyGUI::utility::toString(pos+1));
|
mMagnitudeMaxValue->setCaption(to + " " + MyGUI::utility::toString(pos+1));
|
||||||
|
|
||||||
eventEffectModified(mEffect);
|
eventEffectModified(mEffect);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue