Some cleanup using ReSharper (mostly removing redundancies)

2016-03-12 15:32:34 +02:00
parent ae4e4d8f34
commit d1580328ed
99 changed files with 197 additions and 483 deletions
@@ -66,7 +66,7 @@ namespace Barotrauma
                }

                var pickedBody = Submarine.PickBody(character.SimPosition, enemy.SimPosition, ignoredBodies);
-                if (pickedBody != null && pickedBody.UserData as Limb == null) return;
+                if (pickedBody != null && !(pickedBody.UserData is Limb)) return;

               weapon.Use(deltaTime, character);
            }
@@ -1,9 +1,6 @@
-using Barotrauma.Items.Components;
-using Microsoft.Xna.Framework;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;

 namespace Barotrauma
 {
@@ -59,10 +56,6 @@ namespace Barotrauma
            }
            else
            {
-
-                
-                var pathSteering = character.AIController.SteeringManager as IndoorsSteeringManager;
-
                Hull bestHull = null;
                float bestValue = currenthullSafety;

@@ -75,7 +68,7 @@ namespace Barotrauma
                    hullValue -= (float)Math.Sqrt(Math.Abs(character.Position.X- hull.Position.X));
                    hullValue -= (float)Math.Sqrt(Math.Abs(character.Position.Y - hull.Position.Y)*2.0f);

-                    if (bestHull==null || hullValue > bestValue)
+                    if (bestHull == null || hullValue > bestValue)
                    {
                        bestHull = hull;
                        bestValue = hullValue;
@@ -1,8 +1,6 @@
 using Microsoft.Xna.Framework;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;

 namespace Barotrauma
 {
@@ -2,9 +2,6 @@
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;

 namespace Barotrauma
 {
@@ -1,8 +1,6 @@
 using Microsoft.Xna.Framework;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;

 namespace Barotrauma
 {
@@ -119,7 +117,7 @@ namespace Barotrauma

        public override bool IsDuplicate(AIObjective otherObjective)
        {
-            return (otherObjective as AIObjectiveIdle != null);
+            return (otherObjective is AIObjectiveIdle);
        }
    }
 }
@@ -1,8 +1,5 @@
-using Barotrauma.Items.Components;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;

 namespace Barotrauma
 {