Merge pull request #362 from dymanoid/master

Use Actual Maximum Vehicle Count

Author: FireController1847

TLM/TLM/Custom/Data/CustomVehicle.cs

@@ -28,7 +28,7 @@ public static void Spawn(ref Vehicle vehicleData, ushort vehicleId) {
 				while (trailingVehicle != 0) {
 					vehManager.m_vehicles.m_buffer[trailingVehicle].Spawn(trailingVehicle);
 					trailingVehicle = vehManager.m_vehicles.m_buffer[trailingVehicle].m_trailingVehicle;
-					if (++numIter > VehicleManager.MAX_VEHICLE_COUNT) {
+					if (++numIter > Constants.ServiceFactory.VehicleService.MaxVehicleCount) {
 						CODebugBase<LogChannel>.Error(LogChannel.Core, "Invalid list detected!\n" + Environment.StackTrace);
 						break;
 					}

TLM/TLM/Custom/Manager/CustomVehicleManager.cs

@@ -31,7 +31,7 @@ public bool CustomCreateVehicle(out ushort vehicleId, ref Randomizer r, VehicleI
 #if BENCHMARK
 			using (var bm = new Benchmark(null, "keep-spare-vehicles")) {
 #endif
-				if (this.m_vehicleCount > VehicleManager.MAX_VEHICLE_COUNT - 5) {
+				if (this.m_vehicleCount > Constants.ServiceFactory.VehicleService.MaxVehicleCount - 5) {
 					// prioritize service vehicles and public transport when hitting the vehicle limit
 					ItemClass.Service service = info.GetService();
 					if (service == ItemClass.Service.Residential || service == ItemClass.Service.Industrial || service == ItemClass.Service.Commercial || service == ItemClass.Service.Office) {

TLM/TLM/Manager/Impl/UtilityManager.cs

@@ -127,7 +127,7 @@ public void ResetStuckEntities() {
 			}
 
 			Log.Info($"UtilityManager.RemoveStuckEntities(): Resetting vehicles that are waiting for a path.");
-			for (uint vehicleId = 1; vehicleId < VehicleManager.MAX_VEHICLE_COUNT; ++vehicleId) {
+			for (uint vehicleId = 1; vehicleId < Constants.ServiceFactory.VehicleService.MaxVehicleCount; ++vehicleId) {
 				//Log._Debug($"UtilityManager.RemoveStuckEntities(): Processing vehicle {vehicleId}.");
 				if ((Singleton<VehicleManager>.instance.m_vehicles.m_buffer[vehicleId].m_flags & Vehicle.Flags.WaitingPath) != 0) {
 					if (Singleton<VehicleManager>.instance.m_vehicles.m_buffer[vehicleId].m_path != 0u) {
@@ -141,7 +141,7 @@ public void ResetStuckEntities() {
 			}
 
 			Log.Info($"UtilityManager.RemoveStuckEntities(): Resetting vehicles that are parking and where no parked vehicle is assigned to the driver.");
-			for (uint vehicleId = 1; vehicleId < VehicleManager.MAX_VEHICLE_COUNT; ++vehicleId) {
+			for (uint vehicleId = 1; vehicleId < Constants.ServiceFactory.VehicleService.MaxVehicleCount; ++vehicleId) {
 				//Log._Debug($"UtilityManager.RemoveStuckEntities(): Processing vehicle {vehicleId}.");
 				if ((Singleton<VehicleManager>.instance.m_vehicles.m_buffer[vehicleId].m_flags & Vehicle.Flags.Parking) != 0) {
 					ushort driverInstanceId = CustomPassengerCarAI.GetDriverInstanceId((ushort)vehicleId, ref Singleton<VehicleManager>.instance.m_vehicles.m_buffer[vehicleId]);

TLM/TLM/Manager/Impl/VehicleStateManager.cs

@@ -21,10 +21,6 @@ public class VehicleStateManager : AbstractCustomManager, IVehicleStateManager {
 		/// </summary>
 		public VehicleState[] VehicleStates { get; private set; } = null;
 
-		static VehicleStateManager() {
-			Instance = new VehicleStateManager();
-		}
-
 		protected override void InternalPrintDebugInfo() {
 			base.InternalPrintDebugInfo();
 			Log._Debug($"Vehicle states:");
@@ -37,8 +33,8 @@ protected override void InternalPrintDebugInfo() {
 		}
 
 		private VehicleStateManager() {
-			VehicleStates = new VehicleState[VehicleManager.MAX_VEHICLE_COUNT];
-			for (uint i = 0; i < VehicleManager.MAX_VEHICLE_COUNT; ++i) {
+			VehicleStates = new VehicleState[Constants.ServiceFactory.VehicleService.MaxVehicleCount];
+			for (uint i = 0; i < VehicleStates.Length; ++i) {
 				VehicleStates[i] = new VehicleState((ushort)i);
 			}
 		}
@@ -253,7 +249,7 @@ internal void InitAllVehicles() {
 			Log._Debug("VehicleStateManager: InitAllVehicles()");
 			VehicleManager vehicleManager = Singleton<VehicleManager>.instance;
 
-			for (uint vehicleId = 0; vehicleId < VehicleManager.MAX_VEHICLE_COUNT; ++vehicleId) {
+			for (uint vehicleId = 0; vehicleId < Constants.ServiceFactory.VehicleService.MaxVehicleCount; ++vehicleId) {
 				Services.VehicleService.ProcessVehicle((ushort)vehicleId, delegate (ushort vId, ref Vehicle vehicle) {
 					if ((vehicle.m_flags & Vehicle.Flags.Created) == 0) {
 						return true;

TLM/TMPE.CitiesGameBridge/Service/VehicleService.cs

@@ -11,6 +11,8 @@ private VehicleService() {
 
 		}
 
+        public int MaxVehicleCount => VehicleManager.instance.m_vehicles.m_buffer.Length; 
+
 		public bool CheckVehicleFlags(ushort vehicleId, Vehicle.Flags flagMask, Vehicle.Flags? expectedResult = default(Vehicle.Flags?)) {
 			bool ret = false;
 			ProcessVehicle(vehicleId, delegate (ushort vId, ref Vehicle vehicle) {

TLM/TMPE.GenericGameBridge/Service/IVehicleService.cs

@@ -8,6 +8,9 @@ namespace GenericGameBridge.Service {
 	public delegate bool ParkedVehicleHandler(ushort parkedVehicleId, ref VehicleParked parkedVehicle);
 
 	public interface IVehicleService {
+
+        int MaxVehicleCount { get; }
+
 		bool CheckVehicleFlags(ushort vehicleId, Vehicle.Flags flagMask, Vehicle.Flags? expectedResult = default(Vehicle.Flags?));
 		bool CheckVehicleFlags2(ushort vehicleId, Vehicle.Flags2 flagMask, Vehicle.Flags2? expectedResult = default(Vehicle.Flags2?));
 		bool IsVehicleValid(ushort vehicleId);