Format

Author: Looky1173

Source/RunActivity/Viewer3D/Map/MapDataProvider.cs

@@ -93,7 +93,7 @@ public void PopulateItemLists()
                         {
                             var oldSiding = F.sidings[oldSidingIndex];
                             var oldLocation = oldSiding.Location;
-                            var newLocation = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z);
+                            var newLocation = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z);
 
                             // Because these are structs, not classes, compiler won't let you overwrite them.
                             // Instead create a single item which replaces the 2 platform items.
@@ -118,15 +118,15 @@ public void PopulateItemLists()
                         {
                             var newPlatform = new PlatformWidget(item as PlatformItem)
                             {
-                                Extent1 = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z)
+                                Extent1 = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z)
                             };
                             F.platforms.Add(newPlatform);
                         }
                         else
                         {
                             var oldPlatform = F.platforms[oldPlatformIndex];
                             var oldLocation = oldPlatform.Location;
-                            var newLocation = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z);
+                            var newLocation = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z);
 
                             // Because these are structs, not classes, compiler won't let you overwrite them.
                             // Instead create a single item which replaces the 2 platform items.
@@ -206,7 +206,7 @@ public bool IsActiveTrain(Simulation.AIs.AITrain t)
             return t != null
 && (t.MovementState != Simulation.AIs.AITrain.AI_MOVEMENT_STATE.AI_STATIC
                         && !(t.TrainType == Train.TRAINTYPE.AI_INCORPORATED && !t.IncorporatingTrain.IsPathless)
-                    
+
                     || t.TrainType == Train.TRAINTYPE.PLAYER);
         }
 
@@ -250,7 +250,7 @@ public float GetUnusedYLocation(float startX, float wantY, string name)
             const float noFreeSlotFound = -1f;
 
             var desiredPositionY = (int)(wantY / DispatchViewer.spacing);  // The positionY of the ideal row for the text.
-            var endX = startX + name.Length * F.trainFont.Size;
+            var endX = startX + (name.Length * F.trainFont.Size);
             //out of drawing area
             if (endX < 0)
                 return noFreeSlotFound;

Source/RunActivity/Viewer3D/Map/MapForm.cs

@@ -46,8 +46,6 @@ public partial class MapViewer : Form
         public float xScale = 1; // pixels / metre
         public float yScale = 1; // pixels / metre
 
-        readonly string name = "";
-
         public List<SwitchWidget> switchItemsDrawn;
         public List<SignalWidget> signalItemsDrawn;
         public SwitchWidget switchPickedItem;
@@ -509,8 +507,8 @@ private void DrawTrains(Graphics g, PointF scaledA, PointF scaledB)
             }
             else
             {*/
-                foreach (var train in simulator.Trains)
-                    selectedTrainList.Add(train);
+            foreach (var train in simulator.Trains)
+                selectedTrainList.Add(train);
             /*}*/
 
             foreach (var train in selectedTrainList)
@@ -659,16 +657,11 @@ private void SetTrainColor(Train t, TrainCar locoCar, TrainCar car)
             // inactive loco: RGB 153,128,0
             // active car: RGB 0,204,0
             // inactive car: RGB 0,153,0
-            if (MapDataProvider.IsActiveTrain(t as AITrain))
-            {
-                trainPen.Color = car is MSTSLocomotive
+            trainPen.Color = MapDataProvider.IsActiveTrain(t as AITrain)
+                ? car is MSTSLocomotive
                     ? (car == locoCar) ? Color.FromArgb(204, 170, 0) : Color.FromArgb(153, 128, 0)
-                    : Color.FromArgb(0, 204, 0);
-            }
-            else
-            {
-                trainPen.Color = car is MSTSLocomotive ? Color.FromArgb(153, 128, 0) : Color.FromArgb(0, 153, 0);
-            }
+                    : Color.FromArgb(0, 204, 0)
+                : car is MSTSLocomotive ? Color.FromArgb(153, 128, 0) : Color.FromArgb(0, 153, 0);
 
             if (t.TrainType == Train.TRAINTYPE.STATIC || (t.TrainType == Train.TRAINTYPE.AI && t.GetAIMovementState() == AITrain.AI_MOVEMENT_STATE.AI_STATIC))
             {

Source/RunActivity/Viewer3D/Map/MapThemeProvider.cs

@@ -56,7 +56,7 @@ public void InitializeThemes()
             Themes.Add("dark", DarkTheme);
         }
 
-        private Dictionary<string, ThemeStyle> Themes = new Dictionary<string, ThemeStyle>();
+        private readonly Dictionary<string, ThemeStyle> Themes = new Dictionary<string, ThemeStyle>();
 
         public ThemeStyle GetTheme(string themeName)
         {