mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1685

Browse Source
This commit is contained in:
scrawl 2018-04-22 15:34:31 +00:00
commit d8d26f1de8
No known key found for this signature in database
GPG Key ID: 2E6CC3676024C402
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwmechanics/character.cpp
View File

@ -286,7 +286,7 @@ void CharacterController::refreshHitRecoilAnims()
}
else if (recovery)
{
std::string anim = isSwimming ? chooseRandomGroup("swimhit") : chooseRandomGroup("hit");
std::string anim = chooseRandomGroup("swimhit");
if (isSwimming && mAnimation->hasAnimation(anim))
{
mHitState = CharState_SwimHit;

2
components/misc/rng.cpp
View File

@ -25,7 +25,7 @@ namespace Misc
int Rng::rollDice(int max)
{
return std::uniform_int_distribution<int>(0, max - 1)(generator);
return max > 0 ? std::uniform_int_distribution<int>(0, max - 1)(generator) : 0;
}
}