(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaClient/Source/Items/Components/LevelResource.cs

@@ -7,7 +7,7 @@ namespace Barotrauma.Items.Components
     {
         public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
         {
-            DeattachTimer = msg.ReadSingle();
+            deattachTimer = msg.ReadSingle();
             if (deattachTimer >= DeattachDuration)
             {
                 holdable.DeattachFromWall();

Barotrauma/BarotraumaClient/Source/Items/Components/RepairTool.cs

@@ -1,6 +1,7 @@
 using Barotrauma.Particles;
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,12 +12,21 @@ using System.Xml.Linq;
 namespace Barotrauma.Items.Components
 {
     partial class RepairTool
+#if DEBUG
+        : IDrawableComponent
+#endif
     {
         public ParticleEmitter ParticleEmitter
         {
             get;
             private set;
         }
+#if DEBUG
+        public Vector2 DrawSize
+        {
+            get { return GameMain.DebugDraw ? Vector2.One * Range : Vector2.Zero; }
+        }            
+#endif
 
         private List<ParticleEmitter> ParticleEmitterHitStructure = new List<ParticleEmitter>();
         private List<ParticleEmitter> ParticleEmitterHitCharacter = new List<ParticleEmitter>();
@@ -122,5 +132,17 @@ namespace Barotrauma.Items.Components
                 emitter.Second.Emit(deltaTime, particlePos, item.CurrentHull, particleAngle + MathHelper.Pi, -particleAngle + MathHelper.Pi);
             }            
         }
+#if DEBUG
+        public void Draw(SpriteBatch spriteBatch, bool editing)
+        {
+            if (GameMain.DebugDraw && IsActive)
+            {
+                GUI.DrawLine(spriteBatch, 
+                    new Vector2(debugRayStartPos.X, -debugRayStartPos.Y),
+                    new Vector2(debugRayEndPos.X, -debugRayEndPos.Y),
+                    Color.Yellow);
+            }
+        }
+#endif
     }
 }