Containers: manage both 45ft and 45ftHC containers

Author: Csantucci

Source/Orts.Simulation/Simulation/Container.cs

@@ -42,6 +42,7 @@ public enum ContainerType
         C40ft,
         C40ftHC,
         C45ft,
+        C45ftHC,
         C48ft,
         C53ft
     }
@@ -81,51 +82,7 @@ public enum Status
         public Matrix RelativeContainerMatrix = Matrix.Identity;
         public MSTSWagon Wagon;
         public string LoadFilePath;
-
-
-        // generates container from FreightAnim
- /*       public Container(Simulator simulator, string baseShapeFileFolderSlash, FreightAnimationDiscrete freightAnimDiscrete, ContainerHandlingItem containerStation )
-        {
-            Simulator = simulator;
-            ShapeFileName = freightAnimDiscrete.ShapeFileName;
-            BaseShapeFileFolderSlash = baseShapeFileFolderSlash;
-            MassKG = freightAnimDiscrete.LoadWeightKG;
-            ContainerType = freightAnimDiscrete.ContainerType;
-            switch (ContainerType)
-            {
-                case ContainerType.C20ft:
-                    LengthM = 6.1f;
-                    break;
-                case ContainerType.C40ft:
-                    LengthM = 12.19f;
-                    break;
-                case ContainerType.C40ftHC:
-                    LengthM = 12.19f;
-                    HeightM = 2.9f;
-                    break;
-                case ContainerType.C45ft:
-                    LengthM = 13.7f;
-                    break;
-                case ContainerType.C48ft:
-                    LengthM = 14.6f;
-                    break;
-                case ContainerType.C53ft:
-                    LengthM = 16.15f;
-                    break;
-                default:
-                    break;
-            }
-            WorldPosition.XNAMatrix = freightAnimDiscrete.Wagon.WorldPosition.XNAMatrix;
-            WorldPosition.TileX = freightAnimDiscrete.Wagon.WorldPosition.TileX;
-            WorldPosition.TileZ = freightAnimDiscrete.Wagon.WorldPosition.TileZ;
-            var translation = Matrix.CreateTranslation(freightAnimDiscrete.XOffset, freightAnimDiscrete.YOffset, freightAnimDiscrete.ZOffset);
-            WorldPosition.XNAMatrix = translation * WorldPosition.XNAMatrix;
-            IntrinsicShapeOffset = freightAnimDiscrete.IntrinsicShapeOffset;
-
-            ContainerStation = containerStation;
-        }*/
-
-         public Container(FreightAnimationDiscrete freightAnimDiscreteCopy, FreightAnimationDiscrete freightAnimDiscrete, bool stacked = false)
+        public Container(FreightAnimationDiscrete freightAnimDiscreteCopy, FreightAnimationDiscrete freightAnimDiscrete, bool stacked = false)
         {
             Wagon = freightAnimDiscrete.Wagon;
             Copy(freightAnimDiscreteCopy.Container);
@@ -219,6 +176,9 @@ private void ComputeDimensions()
                     HeightM = 2.9f;
                     break;
                 case ContainerType.C45ft:
+                    LengthM = 13.7f;
+                    break;
+                case ContainerType.C45ftHC:
                     LengthM = 13.7f;
                     HeightM = 2.9f;
                     break;