Fixed C# specifc code #62

Changed C#6 specific code back to CS#5 as it doesn't work with the build script. Something to be addressed later.
midspace · Apr 7, 2016 · 414948c · 414948c
1 parent 640cba1
commit 414948c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Main/SEToolbox/SEToolbox/Interop/SpaceEngineersRepair.cs b/Main/SEToolbox/SEToolbox/Interop/SpaceEngineersRepair.cs
@@ -297,7 +297,7 @@ public static string RepairSandBox(WorldResource world)
                         ?? repairWorld.FindPilotCharacter().Pilot;
 
                     var inventoryBase = character.ComponentContainer.Components.FirstOrDefault(e => e.TypeId == "MyInventoryBase");
-                    MyObjectBuilder_Inventory inventory = inventoryBase?.Component as MyObjectBuilder_Inventory;
+                    MyObjectBuilder_Inventory inventory = inventoryBase == null ? null : inventoryBase.Component as MyObjectBuilder_Inventory;
 
                     if (inventory != null)
                     {

diff --git a/Main/SEToolbox/SEToolbox/Models/StructureFloatingObjectModel.cs b/Main/SEToolbox/SEToolbox/Models/StructureFloatingObjectModel.cs
@@ -123,15 +123,15 @@ public override void UpdateGeneralFromEntityBase()
             {
                 DisplayName = friendlyName;
                 Units = (decimal)FloatingObject.Item.Amount;
-                Volume = cd?.Volume == null ? 0 : cd.Volume.Value * (double)FloatingObject.Item.Amount;
+                Volume = (cd == null || cd.Volume == null) ? 0 : cd.Volume.Value * (double)FloatingObject.Item.Amount;
                 Mass = cd == null ? 0 : cd.Mass * (double)FloatingObject.Item.Amount;
                 Description = string.Format("{0:#,##0.00} Kg", Mass);
             }
             else if (FloatingObject.Item.PhysicalContent is MyObjectBuilder_Ingot)
             {
                 DisplayName = friendlyName;
                 Units = (decimal)FloatingObject.Item.Amount;
-                Volume = cd?.Volume == null ? 0 : cd.Volume.Value * (double)FloatingObject.Item.Amount;
+                Volume = (cd == null || cd.Volume == null) ? 0 : cd.Volume.Value * (double)FloatingObject.Item.Amount;
                 Mass = cd == null ? 0 : cd.Mass * (double)FloatingObject.Item.Amount;
                 Description = string.Format("{0:#,##0.00} Kg", Mass);
             }
@@ -140,7 +140,7 @@ public override void UpdateGeneralFromEntityBase()
                 DisplayName = friendlyName;
                 Description = string.Format("x {0}", FloatingObject.Item.Amount);
                 Units = (decimal)FloatingObject.Item.Amount;
-                Volume = cd?.Volume == null ? 0 : cd.Volume.Value * (double)FloatingObject.Item.Amount;
+                Volume = (cd == null || cd.Volume == null) ? 0 : cd.Volume.Value * (double)FloatingObject.Item.Amount;
                 Mass = cd == null ? 0 : cd.Mass * (double)FloatingObject.Item.Amount;
             }
         }

diff --git a/Main/SEToolbox/SEToolbox/SEToolbox.csproj b/Main/SEToolbox/SEToolbox/SEToolbox.csproj
@@ -38,6 +38,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>