Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-source.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/bridge_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/CMakeLists.txt
#	src/core/smallmap_type.hpp
#	src/disaster_vehicle.h
#	src/effectvehicle_base.h
#	src/fontcache.cpp
#	src/game/game_core.cpp
#	src/game/game_gui.cpp
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/group_gui.cpp
#	src/linkgraph/linkgraph.h
#	src/misc.cpp
#	src/network/core/config.h
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_profiling.cpp
#	src/newgrf_profiling.h
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/order_gui.cpp
#	src/os/windows/font_win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_controller.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/script/script_config.cpp
#	src/script/script_config.hpp
#	src/script/script_instance.cpp
#	src/script/script_scanner.cpp
#	src/script/squirrel.cpp
#	src/script/squirrel_helper.hpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings/network_private_settings.ini
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/window_gui.h

src/script/script_config.hpp

@@ -12,10 +12,10 @@
 
 #include <map>
 #include <list>
-#include "../core/smallmap_type.hpp"
 #include "../company_type.h"
 #include "../textfile_gui.h"
 #include "script_instance.hpp"
+#include <optional>
 
 /** Maximum of 10 digits for MIN / MAX_INT32, 1 for the sign and 1 for '\0'. */
 static const int INT32_DIGITS_WITH_SIGN_AND_TERMINATION = 10 + 1 + 1;
@@ -60,7 +60,6 @@ protected:
 
 public:
 	ScriptConfig() :
-		name(nullptr),
 		version(-1),
 		info(nullptr),
 		is_random(false),
@@ -84,7 +83,7 @@ public:
 	 *   as specified. If false any compatible version is ok.
 	 * @param is_random Is the Script chosen randomly?
 	 */
-	void Change(const char *name, int version = -1, bool force_exact_match = false, bool is_random = false);
+	void Change(std::optional<const std::string> name, int version = -1, bool force_exact_match = false, bool is_random = false);
 
 	/**
 	 * Get the ScriptInfo linked to this ScriptConfig.
@@ -128,7 +127,7 @@ public:
 	/**
 	 * Set the value of a setting for this config.
 	 */
-	void SetSetting(const std::string &name, int value);
+	void SetSetting(const std::string_view name, int value);
 
 	/**
 	 * Reset all settings to their default value.
@@ -159,7 +158,7 @@ public:
 	/**
 	 * Get the name of the Script.
 	 */
-	const char *GetName() const;
+	const std::string &GetName() const;
 
 	/**
 	 * Get the version of the Script.
@@ -190,7 +189,7 @@ public:
 	ScriptInstance::ScriptData *GetToLoadData();
 
 protected:
-	const char *name;                                         ///< Name of the Script
+	std::string name;                                         ///< Name of the Script
 	int version;                                              ///< Version of the Script
 	class ScriptInfo *info;                                   ///< ScriptInfo object for related to this Script version
 	SettingValueList settings;                                ///< List with all setting=>value pairs that are configure for this Script
@@ -207,7 +206,7 @@ protected:
 	 * This function should call back to the Scanner in charge of this Config,
 	 *  to find the ScriptInfo belonging to a name+version.
 	 */
-	virtual ScriptInfo *FindInfo(const char *name, int version, bool force_exact_match) = 0;
+	virtual ScriptInfo *FindInfo(const std::string &name, int version, bool force_exact_match) = 0;
 };
 
 #endif /* SCRIPT_CONFIG_HPP */