Merge pull request #1832

6 years ago · 0c507b74bc
parent 7c7af1da61 5b92910829
commit 0c507b74bc
1 changed files with 3 additions and 1 deletions
--- a/apps/openmw/mwmechanics/difficultyscaling.cpp
+++ b/apps/openmw/mwmechanics/difficultyscaling.cpp
@ -12,8 +12,10 @@ float scaleDamage(float damage, const MWWorld::Ptr& attacker, const MWWorld::Ptr
 {
    const MWWorld::Ptr& player = MWMechanics::getPlayer();

-    // [-100, 100]
+    // [-500, 500]
    int difficultySetting = Settings::Manager::getInt("difficulty", "Game");
+    difficultySetting = std::min(difficultySetting, 500);
+    difficultySetting = std::max(difficultySetting, -500);

    static const float fDifficultyMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDifficultyMult")->getFloat();