(45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-03 16:22:12 +03:00
parent 0dd1823eb1
commit 0ecfc426ff
44 changed files with 660 additions and 549 deletions
@@ -84,12 +84,9 @@ namespace Barotrauma
                    useExtinquisherTimer += deltaTime;
                    if (useExtinquisherTimer > 2.0f) useExtinquisherTimer = 0.0f;

+                    character.AIController.SteeringManager.Reset();
                    character.CursorPosition = fs.Position;
                    character.SetInput(InputType.Aim, false, true);
-                    if (!character.IsClimbing)
-                    {
-                        character.AIController.SteeringManager.Reset();
-                    }
                    extinguisher.Use(deltaTime, character);

                    if (!targetHull.FireSources.Contains(fs))