(ddcbb7983) Added: Disabling of SteamWorkshop on MacOS for now
This commit is contained in:
@@ -195,6 +195,10 @@ namespace Barotrauma
|
|||||||
UserData = Tab.SteamWorkshop,
|
UserData = Tab.SteamWorkshop,
|
||||||
OnClicked = SelectTab
|
OnClicked = SelectTab
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if OSX && !DEBUG
|
||||||
|
steamWorkshopButton.Text += " (Not yet available on MacOS)";
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
new GUIButton(new RectTransform(new Vector2(1.0f, 1.0f), customizeList.RectTransform), TextManager.Get("SubEditorButton"), textAlignment: Alignment.Left, style: "MainMenuGUIButton")
|
new GUIButton(new RectTransform(new Vector2(1.0f, 1.0f), customizeList.RectTransform), TextManager.Get("SubEditorButton"), textAlignment: Alignment.Left, style: "MainMenuGUIButton")
|
||||||
@@ -334,9 +338,9 @@ namespace Barotrauma
|
|||||||
|
|
||||||
this.game = game;
|
this.game = game;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Selection
|
#region Selection
|
||||||
public override void Select()
|
public override void Select()
|
||||||
{
|
{
|
||||||
base.Select();
|
base.Select();
|
||||||
@@ -469,7 +473,7 @@ namespace Barotrauma
|
|||||||
otherButton.Selected = false;
|
otherButton.Selected = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private void QuickStart()
|
private void QuickStart()
|
||||||
{
|
{
|
||||||
@@ -687,6 +691,7 @@ namespace Barotrauma
|
|||||||
GameMain.TitleScreen.TitleSize.Y / 2.0f * GameMain.TitleScreen.Scale + 30.0f),
|
GameMain.TitleScreen.TitleSize.Y / 2.0f * GameMain.TitleScreen.Scale + 30.0f),
|
||||||
0.1f);
|
0.1f);
|
||||||
#if !DEBUG
|
#if !DEBUG
|
||||||
|
#if !OSX
|
||||||
if (Steam.SteamManager.USE_STEAM)
|
if (Steam.SteamManager.USE_STEAM)
|
||||||
{
|
{
|
||||||
if (GameMain.Config.UseSteamMatchmaking)
|
if (GameMain.Config.UseSteamMatchmaking)
|
||||||
@@ -696,6 +701,16 @@ namespace Barotrauma
|
|||||||
}
|
}
|
||||||
steamWorkshopButton.Enabled = Steam.SteamManager.IsInitialized;
|
steamWorkshopButton.Enabled = Steam.SteamManager.IsInitialized;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
if (Steam.SteamManager.USE_STEAM)
|
||||||
|
{
|
||||||
|
if (GameMain.Config.UseSteamMatchmaking)
|
||||||
|
{
|
||||||
|
joinServerButton.Enabled = Steam.SteamManager.IsInitialized;
|
||||||
|
hostServerButton.Enabled = Steam.SteamManager.IsInitialized;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
joinServerButton.Enabled = true;
|
joinServerButton.Enabled = true;
|
||||||
hostServerButton.Enabled = true;
|
hostServerButton.Enabled = true;
|
||||||
@@ -806,7 +821,7 @@ namespace Barotrauma
|
|||||||
GameMain.LobbyScreen.Select();
|
GameMain.LobbyScreen.Select();
|
||||||
}
|
}
|
||||||
|
|
||||||
#region UI Methods
|
#region UI Methods
|
||||||
private void CreateHostServerFields()
|
private void CreateHostServerFields()
|
||||||
{
|
{
|
||||||
Vector2 textLabelSize = new Vector2(1.0f, 0.1f);
|
Vector2 textLabelSize = new Vector2(1.0f, 0.1f);
|
||||||
@@ -887,7 +902,7 @@ namespace Barotrauma
|
|||||||
OnClicked = HostServerClicked
|
OnClicked = HostServerClicked
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user