From deefcafe0292a1c119d4705a6bc90fe2f5040ae9 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat, 2 Dec 2017 14:19:23 +0200
Subject: [PATCH] Made the name of the "Linkable/IsLinkable" property
 consistent

---
 Barotrauma/BarotraumaClient/Source/Items/Item.cs       |  6 +++---
 Barotrauma/BarotraumaClient/Source/Map/Hull.cs         |  2 +-
 Barotrauma/BarotraumaShared/Source/Items/Item.cs       |  4 ++--
 Barotrauma/BarotraumaShared/Source/Map/Hull.cs         |  2 +-
 .../BarotraumaShared/Source/Map/LinkedSubmarine.cs     |  2 +-
 Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs    |  2 +-
 .../BarotraumaShared/Source/Map/MapEntityPrefab.cs     | 10 ++--------
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/Items/Item.cs b/Barotrauma/BarotraumaClient/Source/Items/Item.cs
index 3cdfce85b..00657a557 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Item.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Item.cs
@@ -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);
             }            
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Hull.cs b/Barotrauma/BarotraumaClient/Source/Map/Hull.cs
index 1db89c837..c9992a390 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Hull.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Hull.cs
@@ -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
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Item.cs b/Barotrauma/BarotraumaShared/Source/Items/Item.cs
index 9fd2ee9ef..92c3ddad5 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Item.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Item.cs
@@ -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()
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
index cde34d175..932807c2b 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
@@ -106,7 +106,7 @@ namespace Barotrauma
             }
         }
 
-        public override bool IsLinkable
+        public override bool Linkable
         {
             get { return true; }
         }
diff --git a/Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs b/Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs
index d933efc35..75a9b39f9 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs
@@ -43,7 +43,7 @@ namespace Barotrauma
 
         private XElement saveElement;
 
-        public override bool IsLinkable
+        public override bool Linkable
         {
             get
             {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs b/Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs
index c4d645b88..a2922630d 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs
@@ -84,7 +84,7 @@ namespace Barotrauma
             }
         }
         
-        public virtual bool IsLinkable
+        public virtual bool Linkable
         {
             get { return false; }
         }
diff --git a/Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs b/Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs
index 0d559550f..c6b414315 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs
@@ -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;