Merge branch 'master' into jgrpp

# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp

src/music/allegro_m.cpp

@@ -26,7 +26,7 @@ static MIDI *_midi = nullptr;
  */
 extern int _allegro_instance_count;
 
-const char *MusicDriver_Allegro::Start(const char * const *param)
+const char *MusicDriver_Allegro::Start(const StringList &param)
 {
 	if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, nullptr)) {
 		DEBUG(driver, 0, "allegro: install_allegro failed '%s'", allegro_error);

src/music/allegro_m.h

@@ -15,7 +15,7 @@
 /** Allegro's music player. */
 class MusicDriver_Allegro : public MusicDriver {
 public:
-	const char *Start(const char * const *param) override;
+	const char *Start(const StringList &param) override;
 
 	void Stop() override;
 

src/music/bemidi.cpp

@@ -24,7 +24,7 @@ static BMidiSynthFile midiSynthFile;
 /** Factory for BeOS' midi player. */
 static FMusicDriver_BeMidi iFMusicDriver_BeMidi;
 
-const char *MusicDriver_BeMidi::Start(const char * const *parm)
+const char *MusicDriver_BeMidi::Start(const StringList &parm)
 {
 	return nullptr;
 }

src/music/bemidi.h

@@ -15,7 +15,7 @@
 /** The midi player for BeOS. */
 class MusicDriver_BeMidi : public MusicDriver {
 public:
-	const char *Start(const char * const *param) override;
+	const char *Start(const StringList &param) override;
 
 	void Stop() override;
 

src/music/cocoa_m.cpp

@@ -79,7 +79,7 @@ static void DoSetVolume()
 /**
  * Initialized the MIDI player, including QuickTime initialization.
  */
-const char *MusicDriver_Cocoa::Start(const char * const *parm)
+const char *MusicDriver_Cocoa::Start(const StringList &parm)
 {
 	if (NewMusicPlayer(&_player) != noErr) return "failed to create music player";
 

src/music/cocoa_m.h

@@ -14,7 +14,7 @@
 
 class MusicDriver_Cocoa : public MusicDriver {
 public:
-	const char *Start(const char * const *param) override;
+	const char *Start(const StringList &param) override;
 
 	void Stop() override;
 

src/music/dmusic.cpp

@@ -1074,7 +1074,7 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 }
 
 
-const char *MusicDriver_DMusic::Start(const char * const *parm)
+const char *MusicDriver_DMusic::Start(const StringList &parm)
 {
 	/* Initialize COM */
 	if (FAILED(CoInitializeEx(nullptr, COINITBASE_MULTITHREADED))) return "COM initialization failed";

src/music/dmusic.h

@@ -17,7 +17,7 @@ class MusicDriver_DMusic : public MusicDriver {
 public:
 	virtual ~MusicDriver_DMusic();
 
-	const char *Start(const char * const *param) override;
+	const char *Start(const StringList &param) override;
 
 	void Stop() override;
 

src/music/extmidi.cpp

@@ -36,7 +36,7 @@
 /** Factory for the midi player that uses external players. */
 static FMusicDriver_ExtMidi iFMusicDriver_ExtMidi;
 
-const char *MusicDriver_ExtMidi::Start(const char * const * parm)
+const char *MusicDriver_ExtMidi::Start(const StringList &parm)
 {
 	if (strcmp(VideoDriver::GetInstance()->GetName(), "allegro") == 0 ||
 			strcmp(SoundDriver::GetInstance()->GetName(), "allegro") == 0) {

src/music/extmidi.h

@@ -22,7 +22,7 @@ private:
 	void DoStop();
 
 public:
-	const char *Start(const char * const *param) override;
+	const char *Start(const StringList &param) override;
 
 	void Stop() override;
 

src/music/fluidsynth.cpp

@@ -50,7 +50,7 @@ static void RenderMusicStream(int16 *buffer, size_t samples)
 	fluid_synth_write_s16(_midi.synth, samples, buffer, 0, 2, buffer, 1, 2);
 }
 
-const char *MusicDriver_FluidSynth::Start(const char * const *param)
+const char *MusicDriver_FluidSynth::Start(const StringList &param)
 {
 	std::lock_guard<std::mutex> lock{ _midi.synth_mutex };
 

src/music/fluidsynth.h

@@ -15,7 +15,7 @@
 /** Music driver making use of FluidSynth. */
 class MusicDriver_FluidSynth : public MusicDriver {
 public:
-	const char *Start(const char * const *param) override;
+	const char *Start(const StringList &param) override;
 
 	void Stop() override;
 

src/music/music_driver.hpp

@@ -48,6 +48,6 @@ public:
 	}
 };
 
-extern char *_ini_musicdriver;
+extern std::string _ini_musicdriver;
 
 #endif /* MUSIC_MUSIC_DRIVER_HPP */

src/music/null_m.h

@@ -15,7 +15,7 @@
 /** The music player that does nothing. */
 class MusicDriver_Null : public MusicDriver {
 public:
-	const char *Start(const char * const *param) override { return nullptr; }
+	const char *Start(const StringList &param) override { return nullptr; }
 
 	void Stop() override { }
 

src/music/os2_m.cpp

@@ -80,7 +80,7 @@ bool MusicDriver_OS2::IsSongPlaying()
 	return strcmp(buf, "playing") == 0 || strcmp(buf, "seeking") == 0;
 }
 
-const char *MusicDriver_OS2::Start(const char * const *parm)
+const char *MusicDriver_OS2::Start(const StringList &parm)
 {
 	return 0;
 }

src/music/os2_m.h

@@ -15,7 +15,7 @@
 /** OS/2's music player. */
 class MusicDriver_OS2 : public MusicDriver {
 public:
-	const char *Start(const char * const *param) override;
+	const char *Start(const StringList &param) override;
 
 	void Stop() override;
 

src/music/win32_m.cpp

@@ -366,7 +366,7 @@ void MusicDriver_Win32::SetVolume(byte vol)
 	_midi.new_volume = vol;
 }
 
-const char *MusicDriver_Win32::Start(const char * const *parm)
+const char *MusicDriver_Win32::Start(const StringList &parm)
 {
 	DEBUG(driver, 2, "Win32-MIDI: Start: initializing");
 

src/music/win32_m.h

@@ -15,7 +15,7 @@
 /** The Windows music player. */
 class MusicDriver_Win32 : public MusicDriver {
 public:
-	const char *Start(const char * const *param) override;
+	const char *Start(const StringList &param) override;
 
 	void Stop() override;