teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Take in account PC rank during disposition calculation (bug #4322)

Browse source
This commit is contained in:
Andrei Kortunov 2018-02-10 17:58:30 +04:00
parent b1b8e31562
commit f626a7fcc7
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