mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 08:41:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'uneventful' into 'master'

Browse source 
Don't trigger cell change logic when the player isn't changing cells

Closes #8469

See merge request OpenMW/openmw!4657
This commit is contained in:
psi29a 2025-05-13 20:30:28 +00:00
commit 0251b7c820
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwlua/objectbindings.cpp
View file

@ -100,7 +100,8 @@ namespace MWLua
stats.land(true); stats.land(true);
stats.setTeleported(true); stats.setTeleported(true);
world->getPlayer().setTeleported(true); world->getPlayer().setTeleported(true);
world->changeToCell(destCell->getCell()->getId(), toPos(pos, rot), false); bool differentCell = ptr.getCell() != destCell;
world->changeToCell(destCell->getCell()->getId(), toPos(pos, rot), false, differentCell);
MWWorld::Ptr newPtr = world->getPlayerPtr(); MWWorld::Ptr newPtr = world->getPlayerPtr();
world->moveObject(newPtr, pos); world->moveObject(newPtr, pos);
world->rotateObject(newPtr, rot); world->rotateObject(newPtr, rot);