Skip to content

Commit 6046e4b

Browse files
committed
Merge branch 'pulls/45'
2 parents abc3425 + edfed2b commit 6046e4b

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,6 @@ UpgradeLog*.htm
182182
# Microsoft Fakes
183183
FakesAssemblies/
184184
/logo/
185+
186+
# MSVS 2017 artifacts
187+
/.vs/slnx.sqlite

TLM/TLM/Custom/AI/CustomVehicleAI.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ internal static bool MayChangeSegment(ushort vehicleId, ref Vehicle vehicleData,
454454
#endif
455455
vehicleState.JunctionTransitState = VehicleJunctionTransitState.Stop;
456456

457-
if (sqrSpeed <= TrafficPriorityManager.MAX_SQR_YÌELD_VELOCITY || Options.simAccuracy <= 2) {
457+
if (sqrSpeed <= TrafficPriorityManager.MAX_SQR_YIELD_VELOCITY || Options.simAccuracy <= 2) {
458458
if (Options.simAccuracy >= 4) {
459459
vehicleState.JunctionTransitState = VehicleJunctionTransitState.Leave;
460460
} else {
@@ -482,7 +482,7 @@ internal static bool MayChangeSegment(ushort vehicleId, ref Vehicle vehicleData,
482482
#endif
483483

484484
// vehicle has not yet reached yield speed
485-
maxSpeed = TrafficPriorityManager.MAX_YÌELD_VELOCITY;
485+
maxSpeed = TrafficPriorityManager.MAX_YIELD_VELOCITY;
486486
return false;
487487
}
488488
} else {

TLM/TLM/Manager/TrafficPriorityManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ static TrafficPriorityManager() {
1919
}
2020

2121
public const float MAX_SQR_STOP_VELOCITY = 0.01f;
22-
public const float MAX_SQR_YÌELD_VELOCITY = 0.09f;
23-
public const float MAX_YÌELD_VELOCITY = 0.3f;
22+
public const float MAX_SQR_YIELD_VELOCITY = 0.09f;
23+
public const float MAX_YIELD_VELOCITY = 0.3f;
2424

2525
/// <summary>
2626
/// List of segments that are connected to roads with timed traffic lights or priority signs. Index: segment id

0 commit comments

Comments
 (0)