Merge branch 'master' into release

leezer3 · Apr 23, 2021 · 7bf0fac · 7bf0fac
2 parents 1384392 + 2641136
commit 7bf0fac
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 29 deletions.
diff --git a/WindowsInstaller.ps1 b/WindowsInstaller.ps1
@@ -31,31 +31,6 @@ WizardSmallImageFile=installer_logo.bmp
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
-Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
-Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
-Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
-Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
-Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
-Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-Name: "german"; MessagesFile: "compiler:Languages\German.isl"
-Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
-Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
-Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
-Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
-Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
-Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
-Name: "scottishgaelic"; MessagesFile: "compiler:Languages\ScottishGaelic.isl"
-Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
-Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
-Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
-Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
-Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkablealone
@@ -71,6 +46,7 @@ Source: "InstallerData\filesystem_programfolder.cfg"; DestDir: "{app}\";
 Source: "InstallerData\NDP461-KB3102438-Web.exe"; DestDir: "{app}"; Flags: deleteafterinstall; AfterInstall: AfterMyProgInstall('AllFilesCopy')
 [Icons]
 Name: "{userdesktop}\{#MyAppName}"; Filename: "{app}\{#OpenBVEExecutable}"; Tasks: desktopicon
+Name: "{group}\{#MyAppName} (32-bit)"; Filename: "{app}\OpenBVE-32.exe"
 Name: "{userdesktop}\openBVE Addons"; Filename:"{code:GetDataDir}"; Tasks: desktopicon2
 Name: "{group}\{#MyAppName}"; Filename: "{app}\OpenBVE.exe"
 Name: "{group}\Developer Tools\Route Viewer"; Filename: "{app}\RouteViewer.exe"
@@ -280,4 +256,4 @@ end;
 "@ 
 
 $InstallerOut | Out-File -FilePath $PSScriptRoot\installers\windows\openbve.iss -Encoding UTF8
-& "C:\Program Files (x86)\Inno Setup 5\iscc.exe" /q $PSScriptRoot\installers\windows\openbve.iss
+& "C:\Program Files (x86)\Inno Setup 6\iscc.exe" /q $PSScriptRoot\installers\windows\openbve.iss
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
@@ -33,7 +33,10 @@ jobs:
       solution: '$(solution)'
       platform: '$(buildPlatform)'
       configuration: '$(buildConfiguration)'
-  - script: WindowsInstaller.ps1
+  - task: PowerShell@2
+    inputs:
+      filePath: $(Pipeline.Workspace)/s/WindowsInstaller.ps1
+      arguments: $(git describe --tags)
   - task: CopyFilesOverSSH@0
     inputs:
      sshEndpoint: 'BuildServer'

diff --git a/source/ObjectViewer/InterfaceS.cs b/source/ObjectViewer/InterfaceS.cs
@@ -9,6 +9,7 @@
 using OpenBveApi;
 using OpenBveApi.Interface;
 using OpenBveApi.Objects;
+using TrainManager.Trains;
 
 namespace OpenBve {
 	// --- PluginManager.cs ---
@@ -22,7 +23,10 @@ internal static class CurrentPlugin {
 	internal static class Game {
 		internal static double SecondsSinceMidnight = 0.0;
 
-		internal static void Reset() {
+		internal static void Reset()
+		{
+			Program.TrainManager.Trains = new TrainBase[] { };
+			TrainManager.PlayerTrain = null;
 			Interface.LogMessages.Clear();
 			Program.CurrentHost.MissingFiles.Clear();
 			Program.Renderer.Reset();

diff --git a/source/OpenBVE/System/Input/JoystickManager/JoystickManager32.cs b/source/OpenBVE/System/Input/JoystickManager/JoystickManager32.cs
@@ -10,7 +10,10 @@ class JoystickManager32 : JoystickManager
 
 		internal JoystickManager32()
 		{
-			devices = PIEDevice.EnumeratePIE();
+			if (Program.CurrentHost.Platform == HostPlatform.MicrosoftWindows)
+			{
+				devices = PIEDevice.EnumeratePIE();
+			}
 		}
 
 		internal override int RailDriverCount