Skip to content

Commit f6b5599

Browse files
committed
Deprecate SetEmergency
1 parent 01cbf08 commit f6b5599

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,8 @@ public virtual void HandleEvent(PowerSupplyEvent evt, string message) { }
517517
/// <summary>
518518
/// Called by signalling code externally to stop the train in certain circumstances.
519519
/// </summary>
520-
public abstract void SetEmergency(bool emergency);
520+
[Obsolete("SetEmergency method is deprecated, use HandleEvent(TCSEvent, string) instead")]
521+
public virtual void SetEmergency(bool emergency) { }
521522
/// <summary>
522523
/// Called when player has requested a game save.
523524
/// Set at virtual to keep compatibility with scripts not providing this method.

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ protected set
141141
simulatorEmergencyBraking = value;
142142

143143
if (Script != null)
144+
#pragma warning disable CS0618 // SetEmergency is obsolete
144145
Script.SetEmergency(value);
146+
#pragma warning restore CS0618 // SetEmergency is obsolete
145147
else
146148
Locomotive.TrainBrakeController.TCSEmergencyBraking = value;
147149
}
@@ -1222,12 +1224,15 @@ public override void HandleEvent(TCSEvent evt, string message)
12221224
case TCSEvent.AlerterReleased:
12231225
ResetButtonPressed = false;
12241226
break;
1225-
}
1226-
}
12271227

1228-
public override void SetEmergency(bool emergency)
1229-
{
1230-
ExternalEmergency = emergency;
1228+
case TCSEvent.EmergencyBrakingRequestedBySimulator:
1229+
ExternalEmergency = true;
1230+
break;
1231+
1232+
case TCSEvent.EmergencyBrakingReleasedBySimulator:
1233+
ExternalEmergency = false;
1234+
break;
1235+
}
12311236
}
12321237

12331238
void UpdateVigilance()

0 commit comments

Comments
 (0)