Hotfix: Train/Tram despawning problem fixed

VictorPhilipp · Jul 24, 2016 · 6cc3ffe · 6cc3ffe
1 parent 6b061da
commit 6cc3ffe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/TLM/TLM/Custom/AI/CustomTrainAI.cs b/TLM/TLM/Custom/AI/CustomTrainAI.cs
@@ -144,7 +144,7 @@ public void TrafficManagerSimulationStep(ushort vehicleId, ref Vehicle vehicleDa
 					}
 				}
 			}
-			if ((vehicleData.m_flags & (Vehicle.Flags.Spawned | Vehicle.Flags.WaitingPath | Vehicle.Flags.WaitingSpace | Vehicle.Flags.WaitingCargo)) == 0 && Options.enableDespawning) {
+			if ((vehicleData.m_flags & (Vehicle.Flags.Spawned | Vehicle.Flags.WaitingPath | Vehicle.Flags.WaitingSpace | Vehicle.Flags.WaitingCargo)) == 0 || (vehicleData.m_blockCounter == 255 && Options.enableDespawning)) {
 				Singleton<VehicleManager>.instance.ReleaseVehicle(vehicleId);
 			}
 		}

diff --git a/TLM/TLM/Custom/AI/CustomTramBaseAI.cs b/TLM/TLM/Custom/AI/CustomTramBaseAI.cs
@@ -107,7 +107,7 @@ public void CustomSimulationStep(ushort vehicleId, ref Vehicle vehicleData, Vect
 					break;
 				}
 			}
-			if ((vehicleData.m_flags & (Vehicle.Flags.Spawned | Vehicle.Flags.WaitingPath | Vehicle.Flags.WaitingSpace | Vehicle.Flags.WaitingCargo)) == 0 && Options.enableDespawning) {
+			if ((vehicleData.m_flags & (Vehicle.Flags.Spawned | Vehicle.Flags.WaitingPath | Vehicle.Flags.WaitingSpace | Vehicle.Flags.WaitingCargo)) == 0 || (vehicleData.m_blockCounter == 255 && Options.enableDespawning)) {
 				Singleton<VehicleManager>.instance.ReleaseVehicle(vehicleId);
 			}
 		}

diff --git a/TLM/TLM/UI/UITrafficManager.cs b/TLM/TLM/UI/UITrafficManager.cs
@@ -337,6 +337,8 @@ public static void deactivateButtons() {
 				_buttonTimedMain.focusedBgSprite = "ButtonMenu";
 			if (_buttonLaneChange != null)
 				_buttonLaneChange.focusedBgSprite = "ButtonMenu";
+			if (_buttonLaneConnector != null)
+				_buttonLaneConnector.focusedBgSprite = "ButtonMenu";
 			//_buttonLaneRestrictions.focusedBgSprite = "ButtonMenu";
 			if (_buttonClearTraffic != null)
 				_buttonClearTraffic.focusedBgSprite = "ButtonMenu";
-Original file line number
+Diff line change
@@ Expand Up @@
     					}
     				}
     			}
-    			if ((vehicleData.m_flags & (Vehicle.Flags.Spawned | Vehicle.Flags.WaitingPath | Vehicle.Flags.WaitingSpace | Vehicle.Flags.WaitingCargo)) == 0 && Options.enableDespawning) {
+    			if ((vehicleData.m_flags & (Vehicle.Flags.Spawned | Vehicle.Flags.WaitingPath | Vehicle.Flags.WaitingSpace | Vehicle.Flags.WaitingCargo)) == 0 || (vehicleData.m_blockCounter == 255 && Options.enableDespawning)) {
     				Singleton<VehicleManager>.instance.ReleaseVehicle(vehicleId);
     			}
     		}
@@ Expand Down @@