(a00338777) v0.9.2.1

This commit is contained in:
Joonas Rikkonen
2019-08-26 19:58:19 +03:00
parent 0f63da27b2
commit 80698b58b0
311 changed files with 11763 additions and 4507 deletions
@@ -97,7 +97,7 @@ namespace Barotrauma
SoundPlayer.OverrideMusicType = "none";
SoundPlayer.OverrideMusicDuration = null;
GameMain.SoundManager.SetCategoryGainMultiplier("waterambience", 0.0f);
GameMain.SoundManager.SetCategoryGainMultiplier("waterambience", 0.0f, 0);
GUI.ForceMouseOn(null);
CalculateSpritesheetPosition();
@@ -195,7 +195,7 @@ namespace Barotrauma
base.Deselect();
SoundPlayer.OverrideMusicType = null;
GameMain.SoundManager.SetCategoryGainMultiplier("waterambience", GameMain.Config.SoundVolume);
GameMain.SoundManager.SetCategoryGainMultiplier("waterambience", GameMain.Config.SoundVolume, 0);
GUI.ForceMouseOn(null);
if (isEndlessRunner)
@@ -1467,6 +1467,7 @@ namespace Barotrauma
private void ShowWearables()
{
if (character.Inventory == null) { return; }
foreach (var item in character.Inventory.Items)
{
if (item == null) { continue; }
@@ -1478,7 +1479,7 @@ namespace Barotrauma
private void HideWearables()
{
character.Inventory.Items.ForEachMod(i => i?.Unequip(character));
character.Inventory?.Items.ForEachMod(i => i?.Unequip(character));
}
#endregion