mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-26 09:35:28 +00:00
Merge branch 'wet_and_sneaky' into 'master'
Don't consider underwater sneaking to be sneaking See merge request OpenMW/openmw!1490
This commit is contained in:
commit
46564f08ad
@ -1944,7 +1944,7 @@ void CharacterController::update(float duration)
|
|||||||
bool flying = world->isFlying(mPtr);
|
bool flying = world->isFlying(mPtr);
|
||||||
bool solid = world->isActorCollisionEnabled(mPtr);
|
bool solid = world->isActorCollisionEnabled(mPtr);
|
||||||
// Can't run and sneak while flying (see speed formula in Npc/Creature::getSpeed)
|
// Can't run and sneak while flying (see speed formula in Npc/Creature::getSpeed)
|
||||||
bool sneak = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Sneak) && !flying;
|
bool sneak = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Sneak) && !flying && !inwater;
|
||||||
bool isrunning = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run) && !flying;
|
bool isrunning = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run) && !flying;
|
||||||
CreatureStats &stats = cls.getCreatureStats(mPtr);
|
CreatureStats &stats = cls.getCreatureStats(mPtr);
|
||||||
Movement& movementSettings = cls.getMovementSettings(mPtr);
|
Movement& movementSettings = cls.getMovementSettings(mPtr);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user