vlad.os/LuaCsForBarotraumaEP
0
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
Barotrauma/BarotraumaClient/Source/Items/Item.cs
+3 -3
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);
}
Barotrauma/BarotraumaClient/Source/Map/Hull.cs
+1 -1
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