Merge pull request #1605

7 years ago · 5bb7d76913
parent 899d464b0d f626a7fcc7
commit 5bb7d76913
1 changed files with 7 additions and 0 deletions
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@ -566,9 +566,16 @@ namespace MWMechanics
            {
                std::string itFaction = playerFactionIt->first;

+                // Ignore the faction, if a player was expelled from it.
+                if (playerStats.getExpelled(itFaction))
+                    continue;
+
                int itReaction = MWBase::Environment::get().getDialogueManager()->getFactionReaction(npcFaction, itFaction);
                if (playerFactionIt == playerStats.getFactionRanks().begin() || itReaction < reaction)
+                {
                    reaction = static_cast<float>(itReaction);
+                    rank = playerFactionIt->second;
+                }
            }
        }
        else