Merge pull request #1685

apps/openmw/mwmechanics/character.cpp

@@ -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;

components/misc/rng.cpp

@@ -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;
     }
 
 }