mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:53:51 +00:00
Code Issues Releases Wiki Activity

[Client] Make cell record overrides for current cell more stable

Browse source
This commit is contained in:
David Cernat 2020-08-11 12:33:03 +02:00
parent 9a83108fe5
commit e4529af0a7
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/openmw/mwmp/RecordHelper.cpp
View file

@ -4,6 +4,9 @@
#include "../mwworld/worldimp.hpp"
#include "RecordHelper.hpp"
#include "Main.hpp"
#include "CellController.hpp"
#include "Cell.hpp"
void RecordHelper::overrideRecord(const mwmp::ActivatorRecord& record)
{
@ -333,7 +336,18 @@ void RecordHelper::overrideRecord(const mwmp::CellRecord& record)
}
MWWorld::Ptr playerPtr = world->getPlayerPtr();
bool isCurrentCell = Misc::StringUtils::ciEqual(recordData.mName, playerPtr.getCell()->getCell()->mName);
ESM::Cell playerCell = *playerPtr.getCell()->getCell();
ESM::Position playerPos = playerPtr.getRefData().getPosition();
bool isActiveCell = world->isCellActive(recordData);
if (isActiveCell)
{
mwmp::Main::get().getCellController()->uninitializeCell(recordData);
// Change to temporary holding interior cell
world->changeToInteriorCell(RecordHelper::getPlaceholderInteriorCellName(), playerPos, true, true);
}
if (record.baseId.empty())
{
@ -361,14 +375,13 @@ void RecordHelper::overrideRecord(const mwmp::CellRecord& record)
return;
}
if (isCurrentCell)
// Move the player back to the cell they were in
if (isActiveCell)
{
ESM::Position tempPos;
ESM::Position playerPos = playerPtr.getRefData().getPosition();
// Move the player to a temporary holding cell
world->changeToInteriorCell(getPlaceholderInteriorCellName(), tempPos, true, true);
world->changeToInteriorCell(recordData.mName, playerPos, true, true);
if (playerCell.isExterior())
world->changeToExteriorCell(playerPos, true, true);
else
world->changeToInteriorCell(playerCell.mName, playerPos, true, true);
}
}