Merge branch 'howdidabdufindthis' into 'master'

psi29a · psi29a · commit 34b6a9d4029f · 2024-10-30T14:21:34.000Z
Don't assign vertical movement for inert characters out of water (#7968)

Closes #7968

See merge request OpenMW/openmw!4432
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
@@ -2475,7 +2475,7 @@ namespace MWMechanics
                 movement = osg::Vec3f();
             }
 
-            if (mFloatToSurface)
+            if (mFloatToSurface && world->isSwimming(mPtr))
             {
                 if (cls.getCreatureStats(mPtr).isDead()
                     || (!godmode

Original file line number	Diff line number	Diff line change
`@@ -2475,7 +2475,7 @@ namespace MWMechanics`
`2475`	`2475`	`movement = osg::Vec3f();`
`2476`	`2476`	`}`
`2477`	`2477`
`2478`		`- if (mFloatToSurface)`
	`2478`	`+ if (mFloatToSurface && world->isSwimming(mPtr))`
`2479`	`2479`	`{`
`2480`	`2480`	`if (cls.getCreatureStats(mPtr).isDead()`
`2481`	`2481`	`\|\| (!godmode`