Hotfix: Trams are using regular roads.

VictorPhilipp · Mar 22, 2017 · dc99ae8 · dc99ae8
1 parent 48810a4
commit dc99ae8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/TLM/TLM/Custom/AI/CustomPassengerCarAI.cs b/TLM/TLM/Custom/AI/CustomPassengerCarAI.cs
@@ -357,10 +357,6 @@ public bool CustomStartPathFind(ushort vehicleID, ref Vehicle vehicleData, Vecto
 			return false;
 		}
 
-		public static bool FindParkingSpaceInVicinity(Vector3 targetPos, VehicleInfo vehicleInfo, ushort homeId, out ExtParkingSpaceLocation parkingSpaceLocation, out ushort parkingSpaceLocationId, out Vector3 parkPos, out Quaternion parkRot, out float parkOffset) {
-			return FindParkingSpaceInVicinity(targetPos, vehicleInfo, homeId, out parkingSpaceLocation, out parkingSpaceLocationId, out parkPos, out parkRot, out parkOffset);
-		}
-
 		public static bool FindParkingSpaceInVicinity(Vector3 targetPos, VehicleInfo vehicleInfo, ushort homeId, ushort vehicleId, out ExtParkingSpaceLocation parkingSpaceLocation, out ushort parkingSpaceLocationId, out Vector3 parkPos, out Quaternion parkRot, out float parkOffset) {
 			Vector3 roadParkPos;
 			Quaternion roadParkRot;

diff --git a/TLM/TLM/Custom/PathFinding/CustomPathFind.cs b/TLM/TLM/Custom/PathFinding/CustomPathFind.cs
@@ -1047,7 +1047,7 @@ private void ProcessItemMain(uint unitId, BufferItem item, ref NetSegment prevSe
 					// a simple transition is (1) no junction, (2) no transition and (3) where lane count is equal
 					//bool nextIsSimpleTransition = !nextIsTransition && !nextIsRealJunction && nextSegmentInfo.m_lanes.Length == prevSegmentInfo.m_lanes.Length;
 
-					if (/*!isStrictLaneArrowPolicyEnabled || */nextIsUntouchable) {
+					if (_extVehicleType == null || (prevLane.m_vehicleType & VehicleInfo.VehicleType.Car) == VehicleInfo.VehicleType.None || (_extVehicleType & ExtVehicleType.RoadVehicle) == ExtVehicleType.None || nextIsUntouchable) {
 						// coming from an untouchable segment. do not apply our AI
 
 #if DEBUGPF
@@ -2095,7 +2095,7 @@ private bool ProcessItemCosts(bool debug, BufferItem item, ushort targetNode, us
 		}
 
 		// 3
-		private bool ProcessItemCosts(bool allowAdvancedAI, bool obeyLaneArrows, LaneChangingCostCalculationMode laneChangingCostCalculationMode, bool debug, BufferItem item, ushort targetNodeId, ushort nextSegmentId, ref NetSegment prevSegment, ref NetSegment nextSegment, ref int laneIndexFromInner, byte connectOffset, bool enableVehicle, bool enablePedestrian, int? forceLaneIndex, uint? forceLaneId, byte? forcedLaneDist, out bool foundForced) {
+		private bool ProcessItemCosts(bool allowAdvancedAI, bool obeyStockLaneArrows, LaneChangingCostCalculationMode laneChangingCostCalculationMode, bool debug, BufferItem item, ushort targetNodeId, ushort nextSegmentId, ref NetSegment prevSegment, ref NetSegment nextSegment, ref int laneIndexFromInner, byte connectOffset, bool enableVehicle, bool enablePedestrian, int? forceLaneIndex, uint? forceLaneId, byte? forcedLaneDist, out bool foundForced) {
 
 #if DEBUGPF
 			/*if (_conf.DebugSwitches[0])
@@ -2630,7 +2630,7 @@ private bool ProcessItemCosts(bool allowAdvancedAI, bool obeyLaneArrows, LaneCha
 								if (!aiActivated) {
 									// NON-STOCK CODE END //
 
-									if (obeyLaneArrows) { // TODO check this
+									if (obeyStockLaneArrows) { // TODO check this
 										// this is CO's way of matching lanes between segments
 										int firstTarget = (int)netManager.m_lanes.m_buffer[curLaneId].m_firstTarget;
 										int lastTarget = (int)netManager.m_lanes.m_buffer[curLaneId].m_lastTarget;