mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1605

Browse source
This commit is contained in:
scrawl 2018-02-10 23:15:26 +00:00
commit 5bb7d76913
No known key found for this signature in database
GPG key ID: 2E6CC3676024C402
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -566,9 +566,16 @@ namespace MWMechanics
{ {
std::string itFaction = playerFactionIt->first; 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); int itReaction = MWBase::Environment::get().getDialogueManager()->getFactionReaction(npcFaction, itFaction);
if (playerFactionIt == playerStats.getFactionRanks().begin() || itReaction < reaction) if (playerFactionIt == playerStats.getFactionRanks().begin() || itReaction < reaction)
{
reaction = static_cast<float>(itReaction); reaction = static_cast<float>(itReaction);
rank = playerFactionIt->second;
}
} }
} }
else else