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

Fixed wall-attached sections of a wire not rendering when the item is being rewired outside the sub

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-08-02 16:55:37 +03:00
parent 9099b191d0
commit cafcc76064
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs
+10 -11
View File
@@ -52,9 +52,16 @@ namespace Barotrauma.Items.Components
} }
Vector2 drawOffset = Vector2.Zero; Vector2 drawOffset = Vector2.Zero;
if (item.Submarine != null) Submarine sub = item.Submarine;
if (IsActive && sub == null) // currently being rewired, we need to get the sub from the connections in case the wire has been taken outside
{ {
drawOffset = item.Submarine.DrawPosition + item.Submarine.HiddenSubPosition; if (connections[0] != null && connections[0].Item.Submarine != null) sub = connections[0].Item.Submarine;
if (connections[1] != null && connections[1].Item.Submarine != null) sub = connections[1].Item.Submarine;
}
if (sub != null)
{
drawOffset = sub.DrawPosition + sub.HiddenSubPosition;
} }
float depth = item.IsSelected ? 0.0f : wireSprite.Depth + ((item.ID % 100) * 0.00001f); float depth = item.IsSelected ? 0.0f : wireSprite.Depth + ((item.ID % 100) * 0.00001f);
@@ -76,19 +83,11 @@ namespace Barotrauma.Items.Components
foreach (WireSection section in sections) foreach (WireSection section in sections)
{ {
section.Draw(spriteBatch, item.Submarine == null ? Color.Green : item.Color, drawOffset, depth, 0.3f); section.Draw(spriteBatch, item.Color, drawOffset, depth, 0.3f);
} }
if (IsActive && nodes.Count > 0 && Vector2.Distance(newNodePos, nodes[nodes.Count - 1]) > nodeDistance) if (IsActive && nodes.Count > 0 && Vector2.Distance(newNodePos, nodes[nodes.Count - 1]) > nodeDistance)
{ {
Submarine sub = null;
if (connections[0] != null && connections[0].Item.Submarine != null) sub = connections[0].Item.Submarine;
if (connections[1] != null && connections[1].Item.Submarine != null) sub = connections[1].Item.Submarine;
if (sub != null)
{
drawOffset = sub.DrawPosition + sub.HiddenSubPosition;
}
WireSection.Draw( WireSection.Draw(
spriteBatch, spriteBatch,
new Vector2(nodes[nodes.Count - 1].X, nodes[nodes.Count - 1].Y) + drawOffset, new Vector2(nodes[nodes.Count - 1].X, nodes[nodes.Count - 1].Y) + drawOffset,