Update call sites to use new implementation

CitiesSkylinesMods · Feb 26, 2022 · 3a5f455 · 3a5f455
1 parent 634102d
commit 3a5f455
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/TLM/TLM/Manager/Impl/JunctionRestrictionsManager.cs b/TLM/TLM/Manager/Impl/JunctionRestrictionsManager.cs
@@ -16,6 +16,7 @@ namespace TrafficManager.Manager.Impl {
     using static CSUtil.Commons.TernaryBoolUtil;
     using TrafficManager.Util;
     using TrafficManager.Util.Extensions;
+    using TrafficManager.Lifecycle;
 
     public class JunctionRestrictionsManager
         : AbstractGeometryObservingManager,
@@ -1018,7 +1019,7 @@ private void OnSegmentChange(ushort segmentId,
 
             if (requireRecalc) {
                 RoutingManager.Instance.RequestRecalculation(segmentId);
-                if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+                if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                     ExtSegmentManager.Instance.PublishSegmentChanges(segmentId);
                 }
             }

diff --git a/TLM/TLM/Manager/Impl/LaneArrowManager.cs b/TLM/TLM/Manager/Impl/LaneArrowManager.cs
@@ -12,6 +12,7 @@ namespace TrafficManager.Manager.Impl {
     using UnityEngine;
     using static TrafficManager.Util.Shortcuts;
     using TrafficManager.Util.Extensions;
+    using TrafficManager.Lifecycle;
 
     public class LaneArrowManager
         : AbstractGeometryObservingManager,
@@ -200,7 +201,7 @@ private static void RecalculateFlags(uint laneId) {
         private void OnLaneChange(uint laneId) {
             ushort segment = laneId.ToLane().m_segment;
             RoutingManager.Instance.RequestRecalculation(segment);
-            if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+            if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                 ExtSegmentManager.Instance.PublishSegmentChanges(segment);
             }
         }

diff --git a/TLM/TLM/Manager/Impl/LaneConnectionManager.cs b/TLM/TLM/Manager/Impl/LaneConnectionManager.cs
@@ -14,6 +14,7 @@ namespace TrafficManager.Manager.Impl {
     using static TrafficManager.Util.Shortcuts;
     using TrafficManager.Util;
     using TrafficManager.Util.Extensions;
+    using TrafficManager.Lifecycle;
 
     public class LaneConnectionManager
         : AbstractGeometryObservingManager,
@@ -247,7 +248,7 @@ internal bool RemoveLaneConnection(uint laneId1, uint laneId2, bool startNode1)
             ref NetNode commonNode = ref commonNodeId.ToNode();
             RoutingManager.Instance.RequestNodeRecalculation(ref commonNode);
 
-            if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+            if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                 ExtSegmentManager extSegmentManager = ExtSegmentManager.Instance;
                 extSegmentManager.PublishSegmentChanges(segmentId1);
                 extSegmentManager.PublishSegmentChanges(segmentId2);
@@ -310,7 +311,7 @@ internal void RemoveLaneConnectionsFromSegment(ushort segmentId,
             if (recalcAndPublish) {
                 RoutingManager.Instance.RequestRecalculation(segmentId);
 
-                if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+                if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                     ExtSegmentManager.Instance.PublishSegmentChanges(segmentId);
                 }
             }
@@ -364,7 +365,7 @@ internal void RemoveLaneConnections(uint laneId,
                 ushort segment = laneId.ToLane().m_segment;
                 RoutingManager.Instance.RequestRecalculation(segment);
 
-                if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+                if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                     ExtSegmentManager.Instance.PublishSegmentChanges(segment);
                 }
             }
@@ -426,7 +427,7 @@ internal bool AddLaneConnection(uint sourceLaneId,
             RoutingManager.Instance.RequestRecalculation(sourceSegmentId, false);
             RoutingManager.Instance.RequestRecalculation(targetSegmentId, false);
 
-            if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+            if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                 ExtSegmentManager extSegmentManager = ExtSegmentManager.Instance;
                 extSegmentManager.PublishSegmentChanges(sourceSegmentId);
                 extSegmentManager.PublishSegmentChanges(targetSegmentId);

diff --git a/TLM/TLM/Manager/Impl/VehicleRestrictionsManager.cs b/TLM/TLM/Manager/Impl/VehicleRestrictionsManager.cs
@@ -12,6 +12,7 @@ namespace TrafficManager.Manager.Impl {
     using TrafficManager.Traffic;
     using TrafficManager.Util;
     using TrafficManager.Util.Extensions;
+    using TrafficManager.Lifecycle;
 
     public class VehicleRestrictionsManager
         : AbstractGeometryObservingManager,
@@ -447,7 +448,7 @@ internal bool SetAllowedVehicleTypes(ushort segmentId,
 
             NotifyStartEndNode(segmentId);
 
-            if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+            if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                 ExtSegmentManager.Instance.PublishSegmentChanges(segmentId);
             }
 
@@ -494,7 +495,7 @@ public void AddAllowedType(ushort segmentId,
             Flags.SetLaneAllowedVehicleTypes(segmentId, laneIndex, laneId, allowedTypes);
             NotifyStartEndNode(segmentId);
 
-            if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+            if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                 ExtSegmentManager.Instance.PublishSegmentChanges(segmentId);
             }
         }
@@ -539,7 +540,7 @@ public void RemoveAllowedType(ushort segmentId,
             Flags.SetLaneAllowedVehicleTypes(segmentId, laneIndex, laneId, allowedTypes);
             NotifyStartEndNode(segmentId);
 
-            if (OptionsManager.Instance.MayPublishSegmentChanges()) {
+            if (TMPELifecycle.Instance.MayPublishSegmentChanges()) {
                 ExtSegmentManager.Instance.PublishSegmentChanges(segmentId);
             }
         }