Made the name of the "Linkable/IsLinkable" property consistent

This commit is contained in:
Joonas Rikkonen
2017-12-02 14:19:23 +02:00
parent 905eaeccc2
commit deefcafe02
7 changed files with 11 additions and 17 deletions
@@ -125,7 +125,7 @@ namespace Barotrauma
if (Screen.Selected != GameMain.SubEditorScreen) return; if (Screen.Selected != GameMain.SubEditorScreen) return;
if (!prefab.IsLinkable) return; if (!Linkable) return;
if (!PlayerInput.KeyDown(Keys.Space)) return; if (!PlayerInput.KeyDown(Keys.Space)) return;
bool lClick = PlayerInput.LeftButtonClicked(); bool lClick = PlayerInput.LeftButtonClicked();
@@ -143,7 +143,7 @@ namespace Barotrauma
if (!entity.IsMouseOn(position)) continue; if (!entity.IsMouseOn(position)) continue;
linkedTo.Add(entity); linkedTo.Add(entity);
if (entity.IsLinkable && entity.linkedTo != null) entity.linkedTo.Add(this); if (entity.Linkable && entity.linkedTo != null) entity.linkedTo.Add(this);
} }
} }
else else
@@ -178,7 +178,7 @@ namespace Barotrauma
var itemEditor = new SerializableEntityEditor(this, inGame, editingHUD, true); var itemEditor = new SerializableEntityEditor(this, inGame, editingHUD, true);
if (!inGame && prefab.IsLinkable) if (!inGame && Linkable)
{ {
itemEditor.AddCustomContent(new GUITextBlock(new Rectangle(0, 0, 0, 20), "Hold space to link to another item", "", null, GUI.SmallFont), 1); itemEditor.AddCustomContent(new GUITextBlock(new Rectangle(0, 0, 0, 20), "Hold space to link to another item", "", null, GUI.SmallFont), 1);
} }
@@ -74,7 +74,7 @@ namespace Barotrauma
if (entity == this || !entity.IsHighlighted) continue; if (entity == this || !entity.IsHighlighted) continue;
if (!entity.IsMouseOn(position)) continue; if (!entity.IsMouseOn(position)) continue;
if (entity.IsLinkable && entity.linkedTo != null) entity.linkedTo.Add(this); if (entity.Linkable && entity.linkedTo != null) entity.linkedTo.Add(this);
} }
} }
else else
@@ -296,9 +296,9 @@ namespace Barotrauma
} }
} }
public override bool IsLinkable public override bool Linkable
{ {
get { return prefab.IsLinkable; } get { return prefab.Linkable; }
} }
public override string ToString() public override string ToString()
@@ -106,7 +106,7 @@ namespace Barotrauma
} }
} }
public override bool IsLinkable public override bool Linkable
{ {
get { return true; } get { return true; }
} }
@@ -43,7 +43,7 @@ namespace Barotrauma
private XElement saveElement; private XElement saveElement;
public override bool IsLinkable public override bool Linkable
{ {
get get
{ {
@@ -84,7 +84,7 @@ namespace Barotrauma
} }
} }
public virtual bool IsLinkable public virtual bool Linkable
{ {
get { return false; } get { return false; }
} }
@@ -61,18 +61,12 @@ namespace Barotrauma
} }
[Serialize(false, false)] [Serialize(false, false)]
public bool Linkable //TODO: make this property's name consistent public bool Linkable
{ {
get; get;
private set; private set;
} }
public virtual bool IsLinkable
{
get { return Linkable; }
private set { Linkable = value; }
}
public MapEntityCategory Category public MapEntityCategory Category
{ {
get; get;