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

Fix chargen crash

Browse source
This commit is contained in:
scrawl 2015-06-01 00:50:48 +02:00
parent 84fd682e4e
commit e306853570
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1542,8 +1542,7 @@ namespace MWWorld
} }
const ESM::NPC *ret = mStore.insert(record); const ESM::NPC *ret = mStore.insert(record);
if (update) { if (update) {
mRendering->renderPlayer(getPlayerPtr()); renderPlayer();
scaleObject(getPlayerPtr(), 1.f); // apply race height
} }
return ret; return ret;
} }
@ -2118,13 +2117,12 @@ namespace MWWorld
void World::renderPlayer() void World::renderPlayer()
{ {
MWBase::Environment::get().getMechanicsManager()->remove(getPlayerPtr());
mRendering->renderPlayer(getPlayerPtr()); mRendering->renderPlayer(getPlayerPtr());
scaleObject(getPlayerPtr(), 1.f); // apply race height scaleObject(getPlayerPtr(), 1.f); // apply race height
// At this point the Animation object is live, and the CharacterController associated with it must be created.
// It has to be done at this point: resetCamera below does animation->setViewMode -> CharacterController::forceStateUpdate
// so we should make sure not to use a "stale" controller for that.
MWBase::Environment::get().getMechanicsManager()->add(getPlayerPtr()); MWBase::Environment::get().getMechanicsManager()->add(getPlayerPtr());
std::string model = getPlayerPtr().getClass().getModel(getPlayerPtr()); std::string model = getPlayerPtr().getClass().getModel(getPlayerPtr());