vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed item pickup sounds playing during loading

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-08-24 19:52:04 +03:00
parent c2da3a6af4
commit 7186a8010a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GameMain.cs
+5
View File
@@ -102,6 +102,11 @@ namespace Barotrauma
get; get;
private set; private set;
} }
public bool LoadingScreenOpen
{
get { return loadingScreenOpen; }
}
public GameMain() public GameMain()
{ {
Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs
+2 -2
View File
@@ -88,14 +88,14 @@ namespace Barotrauma.Items.Components
ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker); ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker);
#if CLIENT #if CLIENT
GUI.PlayUISound(GUISoundType.PickItem); if (!GameMain.Instance.LoadingScreenOpen) GUI.PlayUISound(GUISoundType.PickItem);
#endif #endif
return true; return true;
} }
#if CLIENT #if CLIENT
GUI.PlayUISound(GUISoundType.PickItemFail); if (!GameMain.Instance.LoadingScreenOpen) GUI.PlayUISound(GUISoundType.PickItemFail);
#endif #endif
return false; return false;