(83ad1f3d2) Fix a null reference exception.

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:16:31 +03:00
parent 5b3696f7e4
commit 6bdd0ab8c0
9 changed files with 300 additions and 53 deletions
+19 -6
View File
@@ -15,12 +15,6 @@ namespace Barotrauma
public static List<Hull> hullList = new List<Hull>();
public static List<EntityGrid> EntityGrids { get; } = new List<EntityGrid>();
public string DisplayName
{
get;
private set;
}
public static bool EditWater, EditFire;
public const float OxygenDistributionSpeed = 500.0f;
public const float OxygenDeteriorationSpeed = 0.3f;
@@ -174,6 +168,25 @@ namespace Barotrauma
}
}
public string DisplayName
{
get;
private set;
}
private string roomName;
[Editable, Serialize("", true, translationTextTag: "RoomName.")]
public string RoomName
{
get { return roomName; }
set
{
if (roomName == value) { return; }
roomName = value;
DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
}
}
public override Rectangle Rect
{
get