Merge branch 'master' into release

Author: leezer3

source/OpenBVE/Game/ObjectManager/AnimatedObjects/FunctionScripts.cs

@@ -1470,7 +1470,7 @@ internal static void ExecuteFunctionScript(FunctionScript Function, TrainBase Tr
 						s++; break;
 					case Instructions.RainDrop:
 						// n.b. windscreen may be null if we've changed driver car, or this is used in non XML train
-						if (Train == null || !Train.IsPlayerTrain && Train.Cars[Train.DriverCar].Windscreen != null) {
+						if (Train == null || Train.Cars[Train.DriverCar].Windscreen == null) {
 							Function.Stack[s - 1] = 0.0;
 						} else {
 							int n = (int)Math.Round(Function.Stack[s - 1]);

source/Plugins/Formats.OpenBve/CFG/ConfigFile.cs

@@ -583,7 +583,7 @@ public override bool GetValue(T2 key, out double value)
 		{
 			if (keyValuePairs.TryRemove(key, out var s))
 			{
-				if (double.TryParse(s.Value, out value))
+				if (NumberFormats.TryParseDoubleVb6(s.Value, out value))
 				{
 					return true;
 				}
@@ -599,7 +599,7 @@ public override bool TryGetValue(T2 key, ref double value)
 		{
 			if (keyValuePairs.TryRemove(key, out var s))
 			{
-				if (double.TryParse(s.Value, out double newValue))
+				if (NumberFormats.TryParseDoubleVb6(s.Value, out double newValue))
 				{
 					value = newValue;
 					return true;

source/Plugins/Object.CsvB3d/Plugin.Parser.cs

@@ -11,7 +11,7 @@
 using OpenBveApi.Objects;
 using OpenBveApi.Textures;
 
-namespace Plugin
+namespace Object.CsvB3d
 {
 	public partial class Plugin
 	{

source/Plugins/Object.CsvB3d/Plugin.cs

@@ -6,7 +6,7 @@
 using OpenBveApi.Interface;
 using OpenBveApi.Objects;
 
-namespace Plugin
+namespace Object.CsvB3d
 {
     public partial class Plugin : ObjectInterface
     {

source/Plugins/Train.OpenBve/Panel/Panel2CfgParser.cs

@@ -190,6 +190,11 @@ internal void ParsePanel2Config(string PanelFile, string TrainPath, CarBase Car)
 							Block.TryGetValue(Panel2Key.Maximum, ref Maximum);
 							Block.TryGetValue(Panel2Key.NaturalFreq, ref NaturalFrequency);
 							Block.TryGetValue(Panel2Key.DampingRatio, ref DampingRatio);
+							if (DampingRatio < 0)
+							{
+								DampingRatio = -DampingRatio;
+								Plugin.CurrentHost.AddMessage(MessageType.Error, false, "DampingRatio is expected to be non-negative in [Needle] in " + PanelFile);
+							}
 							Block.TryGetColor24(Panel2Key.Color, ref Color);
 							Block.GetValue(Panel2Key.Backstop, out bool Backstop);
 							Block.GetValue(Panel2Key.Smoothed, out bool Smoothed);

source/Plugins/Train.OpenBve/Sound/SoundCfg.Bve4.cs

@@ -230,20 +230,20 @@ internal void Parse(string FileName, string trainFolder, TrainBase train)
 						if (block.GetPath(SoundCfgKey.Music, trainFolder, out string musicLoop) || block.GetPath(SoundCfgKey.MusicLoop, trainFolder, out musicLoop))
 						{
 							Plugin.CurrentHost.RegisterSound(musicLoop, SoundCfgParser.mediumRadius, out var sound);
-							train.Cars[train.DriverCar].Horns[0].LoopSound = sound as SoundBuffer;
-							train.Cars[train.DriverCar].Horns[0].SoundPosition = front;
-							train.Cars[train.DriverCar].Horns[0].Loop = false;
+							train.Cars[train.DriverCar].Horns[2].LoopSound = sound as SoundBuffer;
+							train.Cars[train.DriverCar].Horns[2].SoundPosition = front;
+							train.Cars[train.DriverCar].Horns[2].Loop = true;
 							if (block.GetPath(SoundCfgKey.MusicStart, trainFolder, out string musicStart))
 							{
 								Plugin.CurrentHost.RegisterSound(musicStart, SoundCfgParser.mediumRadius, out var startSound);
-								train.Cars[train.DriverCar].Horns[0].StartSound = startSound as SoundBuffer;
-								train.Cars[train.DriverCar].Horns[0].StartEndSounds = true;
+								train.Cars[train.DriverCar].Horns[2].StartSound = startSound as SoundBuffer;
+								train.Cars[train.DriverCar].Horns[2].StartEndSounds = true;
 							}
 							if (block.GetPath(SoundCfgKey.MusicEnd, trainFolder, out string musicEnd))
 							{
 								Plugin.CurrentHost.RegisterSound(musicEnd, SoundCfgParser.mediumRadius, out var endSound);
-								train.Cars[train.DriverCar].Horns[0].EndSound = endSound as SoundBuffer;
-								train.Cars[train.DriverCar].Horns[0].StartEndSounds = true;
+								train.Cars[train.DriverCar].Horns[2].EndSound = endSound as SoundBuffer;
+								train.Cars[train.DriverCar].Horns[2].StartEndSounds = true;
 							}
 
 						}