Skip to content

Commit bab8b3e

Browse files
committed
Add extra trigger to control track sounds
1 parent f6bf9fa commit bab8b3e

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Source/Orts.Formats.Msts/SoundManagmentFile.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ public class Variable_Trigger : Trigger
393393
{
394394
public enum Events { Speed_Inc_Past, Speed_Dec_Past, Distance_Inc_Past, Distance_Dec_Past,
395395
Variable1_Inc_Past, Variable1_2_Inc_Past, Variable1_3_Inc_Past, Variable1_4_Inc_Past, Variable1_Dec_Past, Variable1_2_Dec_Past, Variable1_3_Dec_Past, Variable1_4_Dec_Past, Variable2_Inc_Past, Variable2_Dec_Past, Variable3_Inc_Past, Variable3_Dec_Past, BrakeCyl_Inc_Past, BrakeCyl_Dec_Past, CurveForce_Inc_Past, CurveForce_Dec_Past, AngleofAttack_Inc_Past, AngleofAttack_Dec_Past, WheelRpM_Dec_Past, WheelRPM_Inc_Past, TrackJoints_Inc_Past, TrackJoints_Dec_Past, CarOnSwitch_Inc_Past, CarOnSwitch_Dec_Past, CarOnXover_Inc_Past, CarOnXover_Dec_Past, WagonAxles_Inc_Past, WagonAxles_Dec_Past,
396-
ConcreteSleepers_Inc_Past, ConcreteSleepers_Dec_Past, CarInTunnel_Inc_Past, CarInTunnel_Dec_Past
396+
ConcreteSleepers_Inc_Past, ConcreteSleepers_Dec_Past, CarInTunnel_Inc_Past, CarInTunnel_Dec_Past,CarCameraDistance_Inc_Past, CarCameraDistance_Dec_Past
397397
};
398398

399399
public Events Event;
@@ -456,6 +456,8 @@ public Variable_Trigger(STFReader f)
456456
case "concretesleepers_dec_past": Event = Events.ConcreteSleepers_Dec_Past; break;
457457
case "carintunnel_inc_past": Event = Events.CarInTunnel_Inc_Past; break;
458458
case "carintunnel_dec_past": Event = Events.CarInTunnel_Dec_Past; break;
459+
case "carcameradistance_inc_past": Event = Events.CarCameraDistance_Inc_Past; break;
460+
case "carcameradistance_dec_past": Event = Events.CarCameraDistance_Dec_Past; break;
459461
}
460462

461463

Source/RunActivity/Viewer3D/Sound.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1988,6 +1988,7 @@ public override void TryTrigger( )
19881988
case Orts.Formats.Msts.Variable_Trigger.Events.CarOnXover_Dec_Past:
19891989
case Orts.Formats.Msts.Variable_Trigger.Events.ConcreteSleepers_Dec_Past:
19901990
case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Dec_Past:
1991+
case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Dec_Past:
19911992
if (newValue < SMS.Threshold)
19921993
{
19931994
Signaled = true;
@@ -2013,6 +2014,7 @@ public override void TryTrigger( )
20132014
case Orts.Formats.Msts.Variable_Trigger.Events.CarOnXover_Inc_Past:
20142015
case Orts.Formats.Msts.Variable_Trigger.Events.ConcreteSleepers_Inc_Past:
20152016
case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Inc_Past:
2017+
case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Inc_Past:
20162018
if (newValue > SMS.Threshold)
20172019
{
20182020
Signaled = true;
@@ -2124,7 +2126,9 @@ private float ReadValue()
21242126
case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Dec_Past:
21252127
case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Inc_Past:
21262128
return car.TrackSoundInTunnelTriggered;
2127-
2129+
case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Dec_Past:
2130+
case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Inc_Past:
2131+
return car.CarTrackControlledDistanceM;
21282132

21292133
default:
21302134
return 0;

0 commit comments

Comments
 (0)