Merge pull request #1026 from Csantucci/mp-chuff

Csantucci · web-flow · commit 273f2ef97af4 · 2025-03-15T16:59:25.000+01:00
Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771
diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/Source/Orts.Simulation/Simulation/Physics/Train.cs
@@ -21664,7 +21664,7 @@ public void UpdateRemoteTrainPos(float elapsedClockSeconds)
                 {
                     car.SpeedMpS = SpeedMpS;
                     if (car.Flipped) car.SpeedMpS = -car.SpeedMpS;
-                    car.AbsSpeedMpS = car.AbsSpeedMpS * (1 - elapsedClockSeconds ) + targetSpeedMpS * elapsedClockSeconds;
+                    car.AbsSpeedMpS = car.AbsSpeedMpS * (1 - elapsedClockSeconds ) + Math.Abs(targetSpeedMpS) * elapsedClockSeconds;
                     if (car.IsDriveable && car is MSTSWagon)
                     {
                         (car as MSTSWagon).WheelSpeedMpS = SpeedMpS;
@@ -21683,7 +21683,7 @@ public void UpdateRemoteTrainPos(float elapsedClockSeconds)
                             else if (car is MSTSSteamLocomotive)
                             {
                                 (car as MSTSSteamLocomotive).Variable1 = car.AbsSpeedMpS / car.DriverWheelRadiusM / MathHelper.Pi * 5;
-                                (car as MSTSSteamLocomotive).Variable2 = 0.7f;
+                                (car as MSTSSteamLocomotive).Variable2 = 70f;
                             }
                         }
                         else if (car is MSTSLocomotive)

Original file line number	Diff line number	Diff line change
`@@ -21664,7 +21664,7 @@ public void UpdateRemoteTrainPos(float elapsedClockSeconds)`
`21664`	`21664`	`{`
`21665`	`21665`	`car.SpeedMpS = SpeedMpS;`
`21666`	`21666`	`if (car.Flipped) car.SpeedMpS = -car.SpeedMpS;`
`21667`		`- car.AbsSpeedMpS = car.AbsSpeedMpS * (1 - elapsedClockSeconds ) + targetSpeedMpS * elapsedClockSeconds;`
	`21667`	`+ car.AbsSpeedMpS = car.AbsSpeedMpS * (1 - elapsedClockSeconds ) + Math.Abs(targetSpeedMpS) * elapsedClockSeconds;`
`21668`	`21668`	`if (car.IsDriveable && car is MSTSWagon)`
`21669`	`21669`	`{`
`21670`	`21670`	`(car as MSTSWagon).WheelSpeedMpS = SpeedMpS;`
`@@ -21683,7 +21683,7 @@ public void UpdateRemoteTrainPos(float elapsedClockSeconds)`
`21683`	`21683`	`else if (car is MSTSSteamLocomotive)`
`21684`	`21684`	`{`
`21685`	`21685`	`(car as MSTSSteamLocomotive).Variable1 = car.AbsSpeedMpS / car.DriverWheelRadiusM / MathHelper.Pi * 5;`
`21686`		`- (car as MSTSSteamLocomotive).Variable2 = 0.7f;`
	`21686`	`+ (car as MSTSSteamLocomotive).Variable2 = 70f;`
`21687`	`21687`	`}`
`21688`	`21688`	`}`
`21689`	`21689`	`else if (car is MSTSLocomotive)`