(052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0

This commit is contained in:
Joonas Rikkonen
2019-04-16 17:11:49 +03:00
parent edb8c39c58
commit bd07acf26d
121 changed files with 1546 additions and 1777 deletions
+13 -6
View File
@@ -63,6 +63,13 @@ namespace Barotrauma
return "Hull";
}
}
[Editable, Serialize("", true)]
public string RoomName
{
get;
set;
}
public string DisplayName
{
@@ -810,17 +817,17 @@ namespace Barotrauma
}
if (roomItems.Contains("reactor"))
return "RoomName.ReactorRoom";
return TextManager.Get("ReactorRoom");
else if (roomItems.Contains("engine"))
return "RoomName.EngineRoom";
return TextManager.Get("EngineRoom");
else if (roomItems.Contains("steering") && roomItems.Contains("sonar"))
return "RoomName.CommandRoom";
return TextManager.Get("CommandRoom");
else if (roomItems.Contains("ballast"))
return "RoomName.Ballast";
return TextManager.Get("Ballast");
if (ConnectedGaps.Any(g => !g.IsRoomToRoom && g.ConnectedDoor != null))
{
return "RoomName.Airlock";
return TextManager.Get("Airlock");
}
Rectangle subRect = Submarine.CalculateDimensions();
@@ -840,7 +847,7 @@ namespace Barotrauma
else
roomPos |= Alignment.Right;
return "RoomName.Sub" + roomPos.ToString();
return TextManager.Get("Sub" + roomPos.ToString());
}
public static Hull Load(XElement element, Submarine submarine)