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

(f9330e2e0) Modified: MacOS to use the same monokickstart when launching server

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-06-04 16:03:35 +03:00
parent 79d4f17c0e
commit babc87903b
5 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/Item.cs
+4 -4
View File
@@ -51,7 +51,7 @@ namespace Barotrauma
{
itemInUseWarning = new GUITextBlock(new RectTransform(new Point(10), GUI.Canvas), "",
textColor: Color.Orange, color: Color.Black,
textAlignment: Alignment.Center, style: "OuterGlow");
textAlignment:Alignment.Center, style: "OuterGlow");
}
return itemInUseWarning;
}
@@ -662,7 +662,7 @@ namespace Barotrauma
new Rectangle(
20, 20,
GameMain.GraphicsWidth - 40,
HUDLayoutSettings.InventoryTopY > 0 ? HUDLayoutSettings.InventoryTopY - 40 : GameMain.GraphicsHeight - 80));
HUDLayoutSettings.InventoryTopY > 0 ? HUDLayoutSettings.InventoryTopY - 20 : GameMain.GraphicsHeight - 80));
foreach (ItemComponent ic in activeHUDs)
{
@@ -740,9 +740,9 @@ namespace Barotrauma
}
}
if (mergedHUDRect != Rectangle.Empty)
if (itemInUseWarning != null && mergedHUDRect != Rectangle.Empty)
{
if (itemInUseWarning != null) { itemInUseWarning.Visible = false; }
itemInUseWarning.Visible = false;
foreach (Character otherCharacter in Character.CharacterList)
{
if (otherCharacter != character &&
Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs
+1 -4
View File
@@ -712,11 +712,8 @@ namespace Barotrauma
" -ownerkey " + ownerKey.ToString();
string filename = "DedicatedServer.exe";
#if LINUX
#if LINUX || OSX
filename = "./DedicatedServer";
#elif OSX
filename = "mono";
arguments = "./DedicatedServer.exe " + arguments;
#endif
var processInfo = new ProcessStartInfo
{