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

[Client] Revert position changes on invalid cell changes to fix glitches

Browse source
This commit is contained in:
David Cernat 2017-04-23 22:25:16 +03:00
parent 5c5c62f33a
commit dba0d47973
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/openmw/mwworld/worldimp.cpp
View file

@ -1167,6 +1167,17 @@ namespace MWWorld
MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, float x, float y, float z, bool movePhysics)
{
/*
Start of tes3mp addition
If we choose to deny this move because it's part of an unapproved cell change, we should also revert the Ptr back to its
original coordinates, so keep track of them
*/
ESM::Position originalPos = ptr.getRefData().getPosition();
/*
End of tes3mp addition
*/
ESM::Position pos = ptr.getRefData().getPosition();
pos.pos[0] = x;
@ -1187,15 +1198,21 @@ namespace MWWorld
/*
Start of tes3mp addition
Check if a DedicatedPlayer or DedicatedActor's new Ptr cell is the same as their packet cell, and deny the Ptr's cell change
if it is not
Check if a DedicatedPlayer or DedicatedActor's new Ptr cell is the same as their packet cell, and deny the Ptr's movement and
cell change if it is not
*/
if (mwmp::PlayerList::isDedicatedPlayer(ptr) &&
!mwmp::Main::get().getCellController()->isSameCell(mwmp::PlayerList::getPlayer(ptr)->cell, *newCell->getCell()))
{
ptr.getRefData().setPosition(originalPos);
return ptr;
}
else if (mwmp::Main::get().getCellController()->isDedicatedActor(ptr) &&
!mwmp::Main::get().getCellController()->isSameCell(mwmp::Main::get().getCellController()->getDedicatedActor(ptr)->cell, *newCell->getCell()))
{
ptr.getRefData().setPosition(originalPos);
return ptr;
}
/*
End of tes3mp addition
*/