mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-06 23:11:23 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cherry-pick-98f52fa8' into 'master'

Browse source 
Issue 4805 MR attempt #2

See merge request OpenMW/openmw!95
This commit is contained in:
Alexei Dobrohotov 2019-04-17 14:30:56 +00:00
commit ef985ab422
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.md
View file

@ -135,6 +135,7 @@ Programmers
Mitchell Schwitzer (schwitzerm) Mitchell Schwitzer (schwitzerm)
naclander naclander
Narmo Narmo
Nat Meo (Utopium)
Nathan Jeffords (blunted2night) Nathan Jeffords (blunted2night)
NeveHanter NeveHanter
Nialsy Nialsy

1
CHANGELOG.md
View file

@ -32,6 +32,7 @@
Bug #4800: Standing collisions are not updated immediately when an object is teleported without a cell change Bug #4800: Standing collisions are not updated immediately when an object is teleported without a cell change
Bug #4803: Stray special characters before begin statement break script compilation Bug #4803: Stray special characters before begin statement break script compilation
Bug #4804: Particle system with the "Has Sizes = false" causes an exception Bug #4804: Particle system with the "Has Sizes = false" causes an exception
Bug #4805: NPC movement speed calculations do not take race Weight into account
Bug #4810: Raki creature broken in OpenMW Bug #4810: Raki creature broken in OpenMW
Bug #4813: Creatures with known file but no "Sound Gen Creature" assigned use default sounds Bug #4813: Creatures with known file but no "Sound Gen Creature" assigned use default sounds
Bug #4815: "Finished" journal entry with lower index doesn't close journal, SetJournalIndex closes journal Bug #4815: "Finished" journal entry with lower index doesn't close journal, SetJournalIndex closes journal

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

@ -2368,6 +2368,19 @@ 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.y() *= scale;
if(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;
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)
{ {