teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Set the default player cell in the StateManager (Fixes #3269)

Browse source
This commit is contained in:
scrawl 2016-04-15 00:49:36 +02:00
parent 8cf91e32fa
commit d784a77f4c
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwstate/statemanagerimp.cpp
View file

@ -492,10 +492,28 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
MWWorld::ConstPtr ptr = MWMechanics::getPlayer();
const ESM::CellId& cellId = ptr.getCell()->getCell()->getCellId();
if (ptr.isInCell())
{
const ESM::CellId& cellId = ptr.getCell()->getCell()->getCellId();
// Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false, false);
// Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false, false);
}
else
{
// Cell no longer exists (i.e. changed game files), choose a default cell
MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(0,0);
float x,y;
MWBase::Environment::get().getWorld()->indexToPosition(0,0,x,y,false);
ESM::Position pos;
pos.pos[0] = x;
pos.pos[1] = y;
pos.pos[2] = 0; // should be adjusted automatically (adjustPlayerPos=true)
pos.rot[0] = 0;
pos.rot[1] = 0;
pos.rot[2] = 0;
MWBase::Environment::get().getWorld()->changeToCell(cell->getCell()->getCellId(), pos, true, false);
}
// Vanilla MW will restart startup scripts when a save game is loaded. This is unintuitive,
// but some mods may be using it as a reload detector.

8
apps/openmw/mwworld/player.cpp
View file

@ -355,12 +355,8 @@ namespace MWWorld
catch (...)
{
std::cerr << "Player cell '" << player.mCellId.mWorldspace << "' no longer exists" << std::endl;
// Cell no longer exists. Place the player in a default cell.
ESM::Position pos = mPlayer.mData.getPosition();
MWBase::Environment::get().getWorld()->indexToPosition(0, 0, pos.pos[0], pos.pos[1], true);
pos.pos[2] = 0;
mPlayer.mData.setPosition(pos);
mCellStore = world.getExterior(0,0);
// Cell no longer exists. The loader will have to choose a default cell.
mCellStore = NULL;
}
if (!player.mBirthsign.empty())