mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 14:09:42 +00:00
Code Issues Releases Wiki Activity

Make sure movement not controlled by animation has valid velocity

Browse source 
Fixes erroneously always normalized movement speed in first person
This commit is contained in:
Capostrophic 2019-11-12 17:10:28 +03:00
parent a1ed0144e1
commit 9c78e8cc56
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwmechanics/character.cpp
View file

@ -1906,6 +1906,17 @@ void CharacterController::update(float duration, bool animationOnly)
bool isPlayer = mPtr == MWMechanics::getPlayer(); bool isPlayer = mPtr == MWMechanics::getPlayer();
bool godmode = isPlayer && MWBase::Environment::get().getWorld()->getGodModeState(); bool godmode = isPlayer && MWBase::Environment::get().getWorld()->getGodModeState();
float scale = mPtr.getCellRef().getScale();
static const bool normalizeSpeed = Settings::Manager::getBool("normalise race speed", "Game");
if (!normalizeSpeed && mPtr.getClass().isNpc())
{
const ESM::NPC* npc = mPtr.get<ESM::NPC>()->mBase;
const ESM::Race* race = world->getStore().get<ESM::Race>().find(npc->mRace);
float weight = npc->isMale() ? race->mData.mWeight.mMale : race->mData.mWeight.mFemale;
scale *= weight;
}
if(!cls.isActor()) if(!cls.isActor())
updateAnimQueue(); updateAnimQueue();
else if(!cls.getCreatureStats(mPtr).isDead()) else if(!cls.getCreatureStats(mPtr).isDead())
@ -2132,6 +2143,8 @@ void CharacterController::update(float duration, bool animationOnly)
jumpstate = mAnimation->isPlaying(mCurrentJump) ? JumpState_Landing : JumpState_None; jumpstate = mAnimation->isPlaying(mCurrentJump) ? JumpState_Landing : JumpState_None;
vec.x() *= scale;
vec.y() *= scale;
vec.z() = 0.0f; vec.z() = 0.0f;
inJump = false; inJump = false;
@ -2322,20 +2335,9 @@ void CharacterController::update(float duration, bool animationOnly)
else else
moved = osg::Vec3f(0.f, 0.f, 0.f); moved = osg::Vec3f(0.f, 0.f, 0.f);
float scale = mPtr.getCellRef().getScale();
moved.x() *= scale; moved.x() *= scale;
moved.y() *= scale; moved.y() *= scale;
static const bool normalizeSpeed = Settings::Manager::getBool("normalise race speed", "Game");
if (mPtr.getClass().isNpc() && !normalizeSpeed)
{
const ESM::NPC* npc = mPtr.get<ESM::NPC>()->mBase;
const ESM::Race* race = world->getStore().get<ESM::Race>().find(npc->mRace);
float weight = npc->isMale() ? race->mData.mWeight.mMale : race->mData.mWeight.mFemale;
moved.x() *= weight;
moved.y() *= weight;
}
// Ensure we're moving in generally the right direction... // Ensure we're moving in generally the right direction...
if(speed > 0.f) if(speed > 0.f)
{ {