From 83081d98c0e257ebbdf22b69ef7a0469abfe2b51 Mon Sep 17 00:00:00 2001 From: Regalis Date: Fri, 22 Apr 2016 23:46:36 +0300 Subject: [PATCH] Water forces aren't applied to disabled bodies, logging sound loading --- Subsurface/Source/Items/Item.cs | 2 +- Subsurface/Source/Sounds/Sound.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Subsurface/Source/Items/Item.cs b/Subsurface/Source/Items/Item.cs index 7cfb24dae..a7a17ff7b 100644 --- a/Subsurface/Source/Items/Item.cs +++ b/Subsurface/Source/Items/Item.cs @@ -721,7 +721,7 @@ namespace Barotrauma /// private void ApplyWaterForces() { - if (!InWater || body == null || Container != null) return; + if (!InWater || Container != null || body == null || !body.Enabled) return; float forceFactor = 1.0f; if (CurrentHull != null) diff --git a/Subsurface/Source/Sounds/Sound.cs b/Subsurface/Source/Sounds/Sound.cs index 6ae2bb627..eaa1f299d 100644 --- a/Subsurface/Source/Sounds/Sound.cs +++ b/Subsurface/Source/Sounds/Sound.cs @@ -44,7 +44,8 @@ namespace Barotrauma { try { - oggSound = OggSound.Load(file); + DebugConsole.Log("Loading sound " + file); + oggSound = OggSound.Load(file); } catch (Exception e) {