mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_7446_coc_height' into 'master'

Browse Source 
Fix #7446: Incorrect height after teleporting from one worldspace to another

Closes #7446

See merge request OpenMW/openmw!3251
This commit is contained in:
psi29a 2023-07-20 07:12:24 +00:00
commit ee1246c756
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwscript/cellextensions.cpp
View File

@ -91,11 +91,12 @@ namespace MWScript
ESM::Position pos;
MWBase::World* world = MWBase::Environment::get().getWorld();
const MWWorld::Ptr playerPtr = world->getPlayerPtr();
MWWorld::Ptr playerPtr = world->getPlayerPtr();
if (const ESM::RefId refId = world->findExteriorPosition(cell, pos); !refId.empty())
{
MWWorld::ActionTeleport(refId, pos, false).execute(playerPtr);
playerPtr = world->getPlayerPtr(); // could be changed by ActionTeleport
world->adjustPosition(playerPtr, false);
return;
}
@ -121,7 +122,7 @@ namespace MWScript
ESM::Position pos;
MWBase::World* world = MWBase::Environment::get().getWorld();
const MWWorld::Ptr playerPtr = world->getPlayerPtr();
MWWorld::Ptr playerPtr = world->getPlayerPtr();
osg::Vec2 posFromIndex
= ESM::indexToPosition(ESM::ExteriorCellLocation(x, y, ESM::Cell::sDefaultWorldspaceId), true);
@ -132,6 +133,7 @@ namespace MWScript
pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
MWWorld::ActionTeleport(ESM::RefId::esm3ExteriorCell(x, y), pos, false).execute(playerPtr);
playerPtr = world->getPlayerPtr(); // could be changed by ActionTeleport
world->adjustPosition(playerPtr, false);
}
};