Merge pull request #1154 from CitiesSkylinesMods/refactoring/ALL_BOOL

Removed weird foreach over { false, true } hack.

Author: DaEgi01

TLM/TLM/Constants.cs

@@ -11,11 +11,6 @@ public static class Constants {
         /// </summary>
         public const float BYTE_TO_FLOAT_SCALE = 1f / 255f;
 
-        /// <summary>
-        /// Array of boolean to allow creating foreach loops
-        /// </summary>
-        public static readonly bool[] ALL_BOOL = { false, true };
-
         /// <summary>
         /// Conversion rate from km/h to game speed (also exists in TrafficManager.API.Constants)
         /// </summary>

TLM/TLM/Manager/Impl/JunctionRestrictionsManager.cs

@@ -160,17 +160,20 @@ public void RemoveJunctionRestrictionsIfNecessary(ushort nodeId) {
         }
 
         protected override void HandleInvalidSegment(ref ExtSegment seg) {
-            foreach (bool startNode in Constants.ALL_BOOL) {
-                SegmentEndFlags flags = startNode
-                                            ? segmentFlags_[seg.segmentId].startNodeFlags
-                                            : segmentFlags_[seg.segmentId].endNodeFlags;
+            HandleInvalidSegment(ref seg, false);
+            HandleInvalidSegment(ref seg, true);
+        }
 
-                if (!flags.IsDefault()) {
-                    AddInvalidSegmentEndFlags(seg.segmentId, startNode, ref flags);
-                }
+        private void HandleInvalidSegment(ref ExtSegment seg, bool startNode) {
+            SegmentEndFlags flags = startNode
+                                        ? segmentFlags_[seg.segmentId].startNodeFlags
+                                        : segmentFlags_[seg.segmentId].endNodeFlags;
 
-                segmentFlags_[seg.segmentId].Reset(startNode, true);
+            if (!flags.IsDefault()) {
+                AddInvalidSegmentEndFlags(seg.segmentId, startNode, ref flags);
             }
+
+            segmentFlags_[seg.segmentId].Reset(startNode, true);
         }
 
         protected override void HandleValidSegment(ref ExtSegment seg) {

TLM/TLM/Util/PriorityRoad.cs

@@ -155,19 +155,23 @@ public static IRecordable FixRoad(List<ushort> segmentList) {
             }
 
             foreach (ushort segmentId in segmentList) {
-                foreach (bool startNode in Constants.ALL_BOOL) {
-                    ushort nodeId = netService.GetSegmentNodeId(segmentId, startNode);
-                    bool isEndNode = nodeId == firstNodeId || nodeId == lastNodeId;
-                    if (isEndNode) {
-                        FixHighPriorityJunction(nodeId);
-                    } else {
-                        FixHighPriorityJunction(nodeId, segmentList);
-                    }
-                }
+                FixHighPriorityJunction(segmentId, firstNodeId, lastNodeId, segmentList, false);
+                FixHighPriorityJunction(segmentId, firstNodeId, lastNodeId, segmentList, true);
             }
+
             return record;
         }
 
+        private static void FixHighPriorityJunction(ushort segmentId, ushort firstNodeId, ushort lastNodeId, List<ushort> segmentList, bool startNode) {
+            ushort nodeId = netService.GetSegmentNodeId(segmentId, startNode);
+            bool isEndNode = nodeId == firstNodeId || nodeId == lastNodeId;
+            if (isEndNode) {
+                FixHighPriorityJunction(nodeId);
+            } else {
+                FixHighPriorityJunction(nodeId, segmentList);
+            }
+        }
+
         private static bool IsStraighOneWay(ushort segmentId0, ushort segmentId1) {
             ref NetSegment seg0 = ref GetSeg(segmentId0);
             //ref NetSegment seg1 = ref GetSeg(segmentId1);

TLM/TLM/Util/RoundaboutMassEdit.cs

@@ -106,31 +106,34 @@ ref GetNode(nodeId),
         }
 
         internal static void FixRulesRoundabout(ushort segmentId) {
-            foreach (bool startNode in Constants.ALL_BOOL) {
-                if (OptionsMassEditTab.RoundAboutQuickFix_PrioritySigns) {
-                    TrafficPriorityManager.Instance.SetPrioritySign(
-                        segmentId,
-                        startNode,
-                        PriorityType.Main);
-                }
+            FixRulesRoundabout(segmentId, false);
+            FixRulesRoundabout(segmentId, true);
+        }
 
-                ushort nodeId = netService.GetSegmentNodeId(
+        private static void FixRulesRoundabout(ushort segmentId, bool startNode) {
+            if (OptionsMassEditTab.RoundAboutQuickFix_PrioritySigns) {
+                TrafficPriorityManager.Instance.SetPrioritySign(
                     segmentId,
-                    startNode);
+                    startNode,
+                    PriorityType.Main);
+            }
 
-                ExtSegmentEnd curEnd = GetSegEnd(segmentId, startNode);
+            ushort nodeId = netService.GetSegmentNodeId(
+                segmentId,
+                startNode);
 
-                if (OptionsMassEditTab.RoundAboutQuickFix_NoCrossMainR) {
-                    JunctionRestrictionsManager.Instance.SetPedestrianCrossingAllowed(
-                        segmentId,
-                        startNode,
-                        false);
-                }
-                JunctionRestrictionsManager.Instance.SetEnteringBlockedJunctionAllowed(
+            ExtSegmentEnd curEnd = GetSegEnd(segmentId, startNode);
+
+            if (OptionsMassEditTab.RoundAboutQuickFix_NoCrossMainR) {
+                JunctionRestrictionsManager.Instance.SetPedestrianCrossingAllowed(
                     segmentId,
                     startNode,
-                    true);
+                    false);
             }
+            JunctionRestrictionsManager.Instance.SetEnteringBlockedJunctionAllowed(
+                segmentId,
+                startNode,
+                true);
         }
 
         internal static void FixRulesMinor(ushort segmentId, ushort nodeId) {