Merge pull request #2931 from Capostrophic/intimidate

Increase disposition on marginal Intimidate wins (#5485)

CHANGELOG.md

@@ -31,6 +31,7 @@
     Bug #5452: Autowalk is being included in savegames
     Bug #5479: NPCs who should be walking around town are standing around without walking
     Bug #5484: Zero value items shouldn't be able to be bought or sold for 1 gold
+    Bug #5485: Intimidate doesn't increase disposition on marginal wins
     Bug #5490: Hits to carried left slot aren't redistributed if there's no shield equipped
     Bug #5499: Faction advance is available when requirements not met
     Feature #390: 3rd person look "over the shoulder"

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

@@ -786,8 +786,11 @@ namespace MWMechanics
             {
                 if (std::abs(c) < iPerMinChange)
                 {
-                    x = 0;
-                    y = -iPerMinChange;
+                    // Deviating from Morrowind here: it doesn't increase disposition on marginal wins,
+                    // which seems to be a bug (MCP fixes it too).
+                    // Original logic: x = 0, y = -iPerMinChange
+                    x = -iPerMinChange;
+                    y = x; // This goes unused.
                 }
                 else
                 {