AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-10-01 00:50:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Veenkar/0.7.1-fix-533' into 0.7.1

Browse Source
This commit is contained in:
David Cernat 2020-02-21 21:24:01 +02:00
commit cf453092ce
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/openmw/mwmp/LocalPlayer.cpp
View File

@ -1253,10 +1253,11 @@ void LocalPlayer::setFactions()
MWWorld::Ptr ptrPlayer = getPlayerPtr(); MWWorld::Ptr ptrPlayer = getPlayerPtr();
MWMechanics::NpcStats &ptrNpcStats = ptrPlayer.getClass().getNpcStats(ptrPlayer); MWMechanics::NpcStats &ptrNpcStats = ptrPlayer.getClass().getNpcStats(ptrPlayer);
LOG_MESSAGE_SIMPLE(TimedLog::LOG_INFO, "Received ID_PLAYER_FACTION from server\n- action: %i", factionChanges.action); LOG_MESSAGE_SIMPLE(TimedLog::LOG_INFO, "Received ID_PLAYER_FACTION from server - action: %i", factionChanges.action);
for (const auto &faction : factionChanges.factions) for (const auto &faction : factionChanges.factions)
{ {
LOG_APPEND(TimedLog::LOG_VERBOSE, " - processing faction: %s", faction.factionId.c_str());
const ESM::Faction *esmFaction = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().search(faction.factionId); const ESM::Faction *esmFaction = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().search(faction.factionId);
if (!esmFaction) if (!esmFaction)
@ -1265,12 +1266,17 @@ void LocalPlayer::setFactions()
continue; continue;
} }
// If the player isn't in this faction, make them join it
if (!ptrNpcStats.isInFaction(faction.factionId))
ptrNpcStats.joinFaction(faction.factionId);
if (factionChanges.action == mwmp::FactionChanges::RANK) if (factionChanges.action == mwmp::FactionChanges::RANK)
{ {
if (!ptrNpcStats.isInFaction(faction.factionId))
{
// If the player isn't in this faction, make them join it
ptrNpcStats.joinFaction(faction.factionId);
LOG_APPEND(TimedLog::LOG_VERBOSE, "\t>JOINED FACTION: %s on rank change to: %d.",
faction.factionId.c_str(), faction.rank);
}
// While the faction rank is different in the packet than in the NpcStats, // While the faction rank is different in the packet than in the NpcStats,
// adjust the NpcStats accordingly // adjust the NpcStats accordingly
while (faction.rank != ptrNpcStats.getFactionRanks().at(faction.factionId)) while (faction.rank != ptrNpcStats.getFactionRanks().at(faction.factionId))