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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
Barotrauma/BarotraumaClient/Source/Items/Item.cs
View File

@@ -125,7 +125,7 @@ namespace Barotrauma
if (Screen.Selected != GameMain.SubEditorScreen) return;
if (!prefab.IsLinkable) return;
if (!Linkable) return;
if (!PlayerInput.KeyDown(Keys.Space)) return;
bool lClick = PlayerInput.LeftButtonClicked();
@@ -143,7 +143,7 @@ namespace Barotrauma
if (!entity.IsMouseOn(position)) continue;
linkedTo.Add(entity);
if (entity.IsLinkable && entity.linkedTo != null) entity.linkedTo.Add(this);
if (entity.Linkable && entity.linkedTo != null) entity.linkedTo.Add(this);
}
}
else
@@ -178,7 +178,7 @@ namespace Barotrauma
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);
}

2
Barotrauma/BarotraumaClient/Source/Map/Hull.cs
View File

@@ -74,7 +74,7 @@ namespace Barotrauma
if (entity == this || !entity.IsHighlighted) 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

4
Barotrauma/BarotraumaShared/Source/Items/Item.cs
View File

@@ -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()

2
Barotrauma/BarotraumaShared/Source/Map/Hull.cs
View File

@@ -106,7 +106,7 @@ namespace Barotrauma
}
}
public override bool IsLinkable
public override bool Linkable
{
get { return true; }
}

2
Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs
View File

@@ -43,7 +43,7 @@ namespace Barotrauma
private XElement saveElement;
public override bool IsLinkable
public override bool Linkable
{
get
{

2
Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs
View File

@@ -84,7 +84,7 @@ namespace Barotrauma
}
}
public virtual bool IsLinkable
public virtual bool Linkable
{
get { return false; }
}

10
Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs
View File

@@ -61,18 +61,12 @@ namespace Barotrauma
}
[Serialize(false, false)]
public bool Linkable //TODO: make this property's name consistent
public bool Linkable
{
get;
private set;
}
public virtual bool IsLinkable
{
get { return Linkable; }
private set { Linkable = value; }
}
public MapEntityCategory Category
{
get;