Merged pull request #1713

0.6.3
Marc Zinnschlag 7 years ago
commit 1564a3f6aa

@ -1621,7 +1621,7 @@ namespace MWWorld
if (!paused) if (!paused)
doPhysics (duration); doPhysics (duration);
updatePlayer(paused); updatePlayer();
mPhysics->debugDraw(); mPhysics->debugDraw();
@ -1637,7 +1637,7 @@ namespace MWWorld
} }
} }
void World::updatePlayer(bool paused) void World::updatePlayer()
{ {
MWWorld::Ptr player = getPlayerPtr(); MWWorld::Ptr player = getPlayerPtr();
@ -1670,7 +1670,7 @@ namespace MWWorld
bool swimming = isSwimming(player); bool swimming = isSwimming(player);
static const float i1stPersonSneakDelta = getStore().get<ESM::GameSetting>().find("i1stPersonSneakDelta")->getFloat(); static const float i1stPersonSneakDelta = getStore().get<ESM::GameSetting>().find("i1stPersonSneakDelta")->getFloat();
if(!paused && sneaking && !(swimming || inair)) if (sneaking && !(swimming || inair))
mRendering->getCamera()->setSneakOffset(i1stPersonSneakDelta); mRendering->getCamera()->setSneakOffset(i1stPersonSneakDelta);
else else
mRendering->getCamera()->setSneakOffset(0.f); mRendering->getCamera()->setSneakOffset(0.f);

@ -129,7 +129,7 @@ namespace MWWorld
Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos); Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
void updateSoundListener(); void updateSoundListener();
void updatePlayer(bool paused); void updatePlayer();
void preloadSpells(); void preloadSpells();

Loading…
Cancel
Save